Working on notes
reworking vim-note mappings
Working on notes settings
Add vimwiki
Considering markdown format
Merge branch 'vimwiki'

Conflicts:
	vimrc
Merge branch 'notes'

Conflicts:
	vimrc