rubocop and cleanup
Merge pull request #9 from sandersonet/integration-cleanup

rubocop and cleanup