--- a/.vimrc
+++ b/.vimrc
@@ -152,14 +152,9 @@ set expandtab
 set shiftwidth=2
 set softtabstop=2
 
-set formatoptions=cqln1
+set formatoptions=cqln1j
 set backspace=indent,eol,start
 
-if has('patch-7.3-541')
-  " Can unwrap this once I don't have to deal with ubuntu 12.04
-  set formatoptions+=j
-endif
-
 set splitright splitbelow
 set scrolloff=15
 set sidescrolloff=10