Twilio integration
Merge branch 'develop' of github.com:christoffer-Van/ETA into develop

Conflicts:
	eta_rails/app/assets/javascripts/map.js.erb
trivial change, probably whitespacing in map js
Merge branch 'develop' of github.com:christoffer-Van/ETA into develop
Twilio can respond and process incoming messages now
Merge branch 'develop' of github.com:christoffer-Van/ETA into develop