adding vim-markdown
Merge branch 'master' of github.com:jbrissier/dotfiles

Conflicts:
	.vimrc
	.zshrc