added defaults for travis
Merge branch 'master' of github.com:eatarandom/capture