Default push and mergetool for git
Add knife zsh plugin and HOME/bin to path
Some new plugin and alias