Merge: merge analysis now returns the user's preference
Update travis settings

Build on 1.2 and allow tip to fail. These failures sometimes are our
fault, sometimes go's.