WHOOPS! Commiting changes from 2 weeks ago. Otherwise, minor bugfixes at behest of round 2 of playtesters.
Merge branch 'master' of https://github.com/crolson/Kanakatana2014