created diff for Justin's comments in issue #1
mostly making lots of okish things bad to tighten up styles
Merge branch 'master' into minor-comments
matching rubocop settings to styleguide