Some cleanup around the guard config

Conflicts:
	Gemfile