Updated <up> <down> mappings for fugitive and vimdiff mode
Merge branch 'master' of github.com:Carton/my-vim

Conflicts:
	vimrc

Signed-off-by: Carton He <carton.he@marvell.com>