Twig markup support
Merge branch 'master' of https://github.com/UltraHertz/vimrc

Removed rogue vim backups on another machine and pushed to master :/