org-mode support
Merge branch 'master' of github.com:masatonagai/.vim

Conflicts:
	.vimrc