Last bit of refactoring and spell checking
Merge branch 'master' of github.com:OCNScrim/Scrimmage3