Fix travis and line lengths

Perhaps the vim people will not be happy with you removing their config comments, but since I'm an emacs person then I'm ok with it.

+1