Travis refactoring/fixes

(don't upload docs on non-master builds)