Merge pull request #71 from adam-vessey/7.x

Fix couple bugs introduced in refactoring for Travis.