Bundle update
Update Twitter links
Merge branch 'master' into pwpush.com

Conflicts:
	Gemfile.lock