vim plugin drmingdrmer/xptemplate
Merge branch 'master' of github.com:larryxiao/dotfiles
Merge branch 'master' of github.com:larryxiao/dotfiles

Conflicts:
	vimrc
get tmux tab navigation to work

C-w <-
C-e ->