vim liquid, markdown
more paths
Merge branch 'master' of github.com:zpao/dotfiles

Conflicts:
	.gitmodules