Modify application to use strong_parameters gem
Use Ruby 1.9 hash syntax
Merge branch 'master' into twilio

Conflicts:
	Gemfile
	app/controllers/incoming_sms_messages_controller.rb
	app/services/sms_messaging_service.rb
	test/functional/incoming_sms_messages_controller_test.rb