Merge branch 'master' into game-dev-levels

app/core/ModuleLoader.coffee

@@ -60,6 +60,11 @@ module.exports = ModuleLoader = class ModuleLoader extends CocoClass
     # load dependencies if it's not a vendor library
     if not _.string.startsWith(e.item.id, 'vendor')
       have = window.require.list()
+      haveWithIndexRemoved = _(have)
+        .filter (file) -> _.string.endsWith(file, 'index')
+        .map (file) -> file.slice(0,-6)
+        .value()
+      have = have.concat(haveWithIndexRemoved)
       console.group('Dependencies', e.item.id) if LOG
       @recentLoadedBytes += e.rawResult.length
       dependencies = @parseDependencies(e.rawResult)

app/views/play/level/tome/TomeView.coffee

@@ -202,7 +202,7 @@ module.exports = class TomeView extends CocoView
     spell = @spellFor thang, spellName
     unless spell?.canRead()
       @clearSpellView()
-      @updateSpellPalette thang, spell
+      @updateSpellPalette thang, spell if spell
       return
     unless spell.view is @spellView
       @clearSpellView()