Fix Travis and docs

I also merged master in which is why there is loads of commits.