Travis badge
Fix spec
Merge remote-tracking branch 'upstream/master'

Conflicts:
	manifests/init.pp