Bump travis-build
bundle update time
merge?
merging fun times