bump up the retry count per http://docs.travis-ci.com/user/build-timeouts/ to try and avoid false failure reports that are really the fault of travis-ci
Merge branch 'master' of github.com-pkarman:popuparchive/pop-up-archive