race condition in move code

user could attempt multiple moves simultaneously
but it would only cost a single move

we use pesimistic locking to stop this
Merge pull request #29 from mitadmin/race_condition_fix

race condition in move code
Added annotate gem and run annotate
Merged master, fixed conflicts of my own stupid making
added notification on team creation
added database.yml for travis and travis config for it so it should pick it up now
Merge pull request #32 from mitadmin/travis_ci_fix

added database.yml for travis and travis config for it so it should pick...
Merge pull request #31 from mitadmin/team_creation_notification

added notification on team creation
Merge branch 'master' into tournament