tweets workin
Merge branch 'master' into shotgun

Conflicts:
	Gemfile
	Gemfile.lock