Finished barrel basics
Merge branch 'master' of github.com:Epiphane/7DRL_2013
Nightly commit