Fixing Specs so that they now pass, which could have caused travis-ci to keep failing
Merge pull request #339 from scouttyg/spec-fixes

Fixing Specs so that they now pass, which could have caused travis-ci to...