Use expect syntax for mock instead of should syntax
Add spork to reduce load time for gems
Merge branch 'feature/rspec3' into develop