reenable twitter
Merge branch 'master' of github.com:zmontesd/ChimeForChange
Merge branch 'master' of github.com:zmontesd/ChimeForChange

Conflicts:
	app/controllers/messages_controller.rb
move twitter integration
fix twitter