add vim-emblem
Merge remote-tracking branch 'upstream/master'

Conflicts:
	vimrc
Remove vim navigator and aaron's