Removed /usr/local/bin in PATH since there already is one.
Added g as git's alias.
Merge branch 'master' into server