tmux colors, ag
Merge branch 'master' of github.com:d48/dotfiles

Conflicts:
	.vimrc
mergy from stash