Merge
Merge branch 'master' of github.com:edwelker/nix_conf
Merge branch 'master' of github.com:edwelker/nix_conf
Merge branch 'master' of github.com:edwelker/nix_conf

Conflicts:
	Install
	com.googlecode.iterm2.plist
	macsetup.sh
update tmux message display time
Merge branch 'master' of github.com:edwelker/nix_conf