Fixes indentation in emacs: never use tabs, except in Makefile
Fixes tab indentation in .zshrc
Puts ~ instead of /home/thibault in .zshrc
Revert "Changes emacs alias: no need for emacsibolt script"

This reverts commit d358c45eb166d8406450027547c781ee39464120. The
script is actually needed to set EDITOR.
Sets git to use ediff for mergetool
Adds bin/ scripts + renames emacsibolt to emacsclient.sh
Merge branch 'master' into vaio