Updates to some files.
Merge branch 'master' of https://github.com/mgerdes/Battlecode2014