Directory navigation
Merge branch 'master' of github.com:mjArcher/dotvim

Conflicts:
	vimrc