Several changes for clean up.
Merge conflict
Merge branch 'master' of https://github.com/herman-rogers/IndieSpeedRun2013