Try better matcher for AM::Errors
Merge branch 'master' of github.com:danielfone/heroku_config_vars

Conflicts:
	Gemfile.lock.orig