Continue removing references to energon and encampments
Update specs
Merge branch 'master' of github.com:battlecode/battlecode-server