Add surround plugin as submodule
Change mustache submodule
Update .gitignore