Prepare for version 7.0.4
Put rspec options in a .rspec file for rspec 3