Fix heroku on macbook
Merge branch 'master' of heroku.com:restomd

Conflicts:
	Gemfile
	Gemfile.lock
Horsing around with heroku merge