git-propen
Merge branch 'master' of ssh://github.com/iwag/dotfiles

Conflicts:
	home/.zshrc_all
fix peco