upgrade rubocop to 0.23.0
update to rspec 3.0.0
Merge branch 'master' into v1.3.0