Merge pull request #168 from apenney/rspec-system