Merge branch 'master' into 3divs-dev

Conflicts:
	public/stylesheets/style.css
Merge branch 'dev' of https://github.com/3divs/OpenRecess into 3divs-dev

Conflicts:
	public/stylesheets/style.css
Merge branch 'dev' of https://github.com/3divs/OpenRecess into 3divs-dev

Conflicts:
	public/stylesheets/style.css
Adding heroku specific configs
moved twilio auth and secret keys into bash profile and heroku settings
Merge branch 'master' of heroku.com:openrecess

Conflicts:
	public/stylesheets/style.css
Merge pull request #42 from AndrewMagliozzi/master

changed the twilio account to Andrew's and hid all auth tokens