Merge branch 'makeswarmworkable' of https://github.com/nixondanielj/battlecode2013 into dan