Cherry Picking Twitter Widget Changes and Fixing Conflicts
https+capatross+capistrano updates
Merge branch 'development' into front_porch

Conflicts:
	app/views/admin/edit_public_community.html.erb