update travis config, minor lint fixes
Merge branch 'travis_update' of https://github.com/jlambert121/acidprime-r10k

Conflicts:
	manifests/params.pp