Initial commit from work computer
Partial merge of branch 'master' of https://github.com/mmcclimon/vim_files

Conflicts:
	.gitignore
	ftdetect/mkd.vim
	gvimrc
	syntax/mkd.vim
	vimrc