Cleaned up stuff and removed some commented code.
Merge branch 'master' of https://github.com/calebmanley/Enderportation