Merge pull request #30 from ehaselwanter/master

streamline .rubocop config
add Gemfile.lock to ignore list and remove it from tree