More cleanup
Merge branch 'master' of https://github.com/howpez/ludum-dare-2013-12