Improved portability by using 'g:vim_config_root'
Merge remote-tracking branch 'origin/master'

Conflicts:
	autoload/z_menu.vim