reconciled work branch
Merge branch 'master' into work

Conflicts:
	vim/bundle/bufexplorer/plugin/bufexplorer.vim