Fix travis so it doesnt bump on a tag [ci-skip]
Merge branch master [ci-skip]