Add working oauth for google
-NOTE: need to refactor to eliminate traditional login and user creation
-Need to add user update form
Merge remote-tracking branch 'origin/master' into ticket_partial

Conflicts:
	Gemfile.lock
	app/.DS_Store
	app/controllers/users_controller.rb
	config/routes.rb
update previous push to have Ruby version 2.0.0
Merge pull request #30 from bumblebees-2014/oauth_works2

Oauth works2