.kiln plungin issue - hg version
.tmux clipboard
Merge branch 'master' of https://github.com/ecornell/dot-files
ls colors
Merge branch 'master' of https://github.com/ecornell/dot-files

Conflicts:
	.zshrc