Fix travis link (branch master now)
Merge branch 'master' into bob-branch