Add number_iterator & Co
Modify template
Merge branch 'master' of https://github.com/kormyshov/vimfiles