Some bug fixing & refactoring
Merge branch 'dev' of https://github.com/kiasaki/ld26-jam-april2013 into dev