Update vim.pathogen to 2.3
Move highlighting declarations to proper init file
Changes to vimrc for updated pathogen