Update php syntax highlighting
Adds vim-twig, moves all settings back to vimrc
Removes vim-twig as htmldjango seems much better
Adds htmljinja and htmldjango tomfoolery to handle twig files