Starting to get 2 teams going.
Re-enabling all tests
Merge branch 'teams'
Merge branch 'master' of github.com:OperationMonkey/monkey-face