rfk Merge pull request #29 from mozilla-services/chore/28-travis