updated to rubocop 21 and fixed issues stemming from that
adding rubocop 0.21.0 to gemfile