Improved Markdown handling
Merge branch 'master' of github.com:AggroBoy/dotfiles

Conflicts:
	vimrc