Updated gems
Bad Commit, Did too much and too little

I changed all instances of log{in,out} to sign{in,out} and started
adding the scaffolding for facebook login.
Basic facebook login working
Improve basic facebook auth.
Merge branch 'master' into heroku

Conflicts:
	Gemfile
	Gemfile.lock