Merge pull request #7 from ehaselwanter/master

rubocop fixes
Use the new Ruby 1.9 hash syntax.
streamline .rubocop config