First pass through with rubocop
Rubocop tidyup
Merge branch 'feature/rubocop-tidyup' into develop
Bumped version for 0.1.2 release
Fixed merge conflicts for 0.1.2