I had to recreate my vimrc. Based heavily on http://statico.github.io/vim.html

.vimrc

"BEGIN Vundle stuff
set nocompatible
filetype off

set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin()

Plugin 'gmarik/Vundle.vim'

Plugin 'kien/ctrlp.vim'
Plugin 'scrooloose/nerdtree'
Plugin 'scrooloose/syntastic'
Plugin 'Valloric/YouCompleteMe'

Plugin 'closetag.vim'

Plugin 'CSApprox'
Plugin 'jnurmine/Zenburn'

call vundle#end()
filetype plugin indent on

"END Vundle stuff

"BEGIN Key rebinds
nnoremap j gj
nnoremap k gk

nmap # :tabn<CR>
nmap <C-#> :tabp<CR>
nmap <C-n> :tabe<Space>

nmap <C-p> :CtrlPBuffer<CR>

nmap <Leader>n :NERDTreeToggle<CR>
"END Key rebinds

"BEGIN Plugin settings

"YCM
let g:ycm_complete_in_comments = 1
let g:ycm_global_extra_conf = '~/.vim/bundle/YouCompleteMe/ycm_global_extra_conf.py'
let g:ycm_extra_conf_globlist = ['~/dev/*', '!~/*']
let g:ycm_autoclose_preview_window_after_completion = 1

"NERD tree
autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif

"Ctrl-P
let g:ctrlp_map = '<Leader>t'
let g:ctrlp_match_window_bottom = 0
let g:ctrlp_match_window_reversed = 0
let g:ctrlp_custom_ignore = '\v\~$|\.(o|swp|pyc|wav|mp3|ogg|blend)$|(^|[/\\])\.(hg|git|bzr)($|[/\\])|__init__\.py' 
let g:ctrlp_working_path_mode = 0
let g:ctrlp_dotfiles = 0
let g:ctrlp_switch_buffer = 0
"END Plugin settings

colors zenburn
syntax on

set laststatus=2
set tabstop=4
set softtabstop=4
set shiftwidth=4
set expandtab
set incsearch
set ignorecase
set smartcase
set hlsearch
nmap <Leader>q :nohlsearch<CR>

Extra bits: airline instead of powerline, hdevtools, ghc-mod. The virtualbox harddrive is corrupted AGAIN so...