Fix bug with travis and merging master into gh-pages