Begin consolidating/refactoring
Merge branch 'master' of github.com:tmcarthur/trooth