Merge pull request #20 from gregerg/master

more travis tinkering, api key changed again
changing api key again