Fix xmodmap issue
Better pane navigation in tmux
Upgrade vim bundles
Merge branch 'master' into macosx

Conflicts:
	xmodmap/base