Update tmux config.
Install NeoBundle.
Merge branch 'master' of https://github.com/konnyakmannan/dotfiles

Conflicts:
	.vim/bundle/.neobundle/install_info