doc changes
specifying travis branches
travis whitelist -> blacklist
Merge branch 'master' into develop