upgraded to play 2.2.2
Merge pull request #13 from carrielies/master

upgraded to play 2.2.2
ignoring as we have no shared auth
Merge branch 'master' into ignore_twitter_test
Merge pull request #14 from ollyjshaw/ignore_twitter_test

Ignore twitter test
Merge branch 'master' into guice_di
Formatting and refactoring