Merge pull request #4 from ehaselwanter/master

streamline .rubocop config
add lockfiles and delete them from tree