Updating to latest code.
Merge branch 'master' of github.com:infovore/alain-de-bot

Conflicts:
	Gemfile
	Gemfile.lock