Added Rubocop to Guard and structured Gemfile better
Added swap files to gitignore
Bunch of rubocop fixes
More Rubocop fixes
Moved rspec to be after rubocop
Merge branch 'feature/tidy-refactor' into develop