Fix specs for rspec 3
Fix rubocop warnings
Prepare for release