Updates to pass tests on upcoming relengapi 0.3 (master)
Fix travis as well
More fixes for travis
More fixes for travis
Merge pull request #6 from Callek/master

Looks good to me.