some work on adding omniauth
Merge branch 'master' into 1-add-omniauth

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
add ability to log in and out via github