Add alias for hub and grep (as GREP_OPTIONS is now deprecated). Add new cluster for cssh. Set git to avoid fast-forward merges by default.