bump version
travis bump
merge