Use correct repo and fix a syntax error
Merge branch 'master' into travis
Merge pull request #7 from kalabox/travis

Travis