twilio successfully sending texts
Merge branch 'master' into twilio-integration

Conflicts:
	Gemfile
	config/routes.rb
twilio working, bart updated slightly

* twilio integration via model
* bart code works, but is spaghetti as heck
fixing merge conflict in gitignore
trying to fix merge conflicts
updating gitignore again
merging bart.rb