Merge pull request #5 from ksd5/master

More entity fixes, and some other stuff as well.
Merge branch 'master' of https://github.com/usacs/HackRU