Added more tests, added string capture, updated VIM templates improved nested template handling