Merge pull request #28 from ehaselwanter/master

streamline .rubocop config
add Puppetfile.lock to ignore list and delete it from tree