use submodules
Merge branch 'master' of github.com:dock0/blog
combine nginx confs
adjust naming