whatever
Merge branch 'master' of github.com:rtaibah/dotfiles

Conflicts:
	.vim/.netrwhist
Add vim-markdown plugin