Additional config from http://mislav.uniqpath.com/2011/12/vim-revisited/