bug fixes all around
Merge remote-tracking branch 'origin/jake'

Conflicts:
	src/edu/ucsc/gameAI/fsm/StateMachine.java
derp