attempting to mollify travis
Merge branch 'master' of github.com:tumblr/TMCache