Swap around some Ruby stuff

tpope's stuff is just better, innit
Make puppet-lint checking sane

Puppet lines just have to be over 80 chars sometimes - that and we don't
care about deprecated checks. We'd rather have cleaner code.