Wiped Entity to only include things useful to us
Merge branch 'master' of https://github.com/Epiphane/GGJ2014