update
tmux mouse scroll
Merge branch 'master' of github.com:pilu/.dotfiles

Conflicts:
	index.sh
	vimrc