Update rspec
rspec --init
Merge branch 'feature/rspec3' into develop