Better logging in.
Added google_token field on user for future reader import.
Merge branch 'master' of github.com:dbenamy/monkey-shit

* 'master' of github.com:dbenamy/monkey-shit:
  as_it_happens and now

Conflicts:
	db/schema.rb