adding changes from darkroom
Merge branch 'master' of github.com:phutchins/dot-files

Conflicts:
	.tmux.conf.phutchins