Merge pull request #4 from off-koss/bigmac

add mcdiff as diff tool for git + two little scripts to enabling it on s...
Merge pull request #5 from off-koss/bigmac

fix 'if'
change addgitdiff
Merge pull request #6 from off-koss/ubuntu_edx

change addgitdiff
full power of grep && printf
Merge pull request #7 from off-koss/maraschino

full power of grep && printf
Add some settings from .zshrc.orig to current .zshrc & rm .zshrc.orig
Add setting for ssh remote forwarding to .ssh/config