Oops
Merge branch 'master' of github.com:ambivalentduck/psychicRobot
Unit testing seemingly complete.