Merge pull request #8 from ehaselwanter/master

streamline rubocop, fix issue which comes with this change
add lockfiles and delete them from tree