Shittily gets google side of omniauth working
Merges master + fixes conflicts
Fixes Google Oauth
Removes flash messages from application layout
Merge branch 'master' into google-omniauth
Fixes logging in the traditional way

Setup our own SessionsController#create method which pretty much mimics Devise's expect we pass in our own scope.
Merge branch 'master' of github.com:Gowiem/Sisyphus