Add markdown syntax plugin
Merge branch 'master' into dbeardsley

Conflicts:
	.gitmodules