Merge pull request #19 from gregerg/master

let's try this at least 20 more times please
more travis tinkering, api key changed again