Clean up vimrc a bit and start tweaking Unite