major refactor in one commit, woo woo!
Merge branch 'master' of github.com:robertfw/hockeybrain