Removed whitespace.
Removed old cold.
Commit needs some love
Merge remote-tracking branch 'origin/master' into CleanCowlingoTesting

Conflicts:
	manifests/init.pp
	templates/jail.local.erb
Dont allow spec/fixtures directory to be added