Update to RSpec3
Update to RSpec3
Small refactorings; line spacing and use setters and getters where pos
Add line below 'private' modifier
Merge pull request #1 from rob-murray/rspec_upd

Rspec update