WIP vundle
More stuff... AAAAAAA
Add handlebars syntax
Resolve merge conflicts