Wisp + tower fixes.
Merge branch 'master' of https://github.com/esfdk/DarkForest