Modularize starter-kit-yasnippet
Merge branch 'master-2'