Made various fixes
Merge branch 'master' of https://github.com/HackSoc/LudumDare29