Minor fixes to BotClientMap
Merge branch 'master' of github.com:jwbowler/maslab-2014
Fixes map loading for late starts
Merge branch 'master' of github.com:jwbowler/maslab-2014

Conflicts:
	BotClient/Java/src/BotClient/BotClient.java
Cleans up BotClient API