Merge pull request #7 from ehaselwanter/master

rubocop fixes
add lockfiles and delete them from tree