Cosmurf before smurfing
Merge branch 'master' of https://github.com/Epiphane/7DRL_2013
Working on final arena