Fixed outstanding rspec failures
Merge branch 'master' of https://github.com/mseankelly/parallel_tests