Update customized cd alias to be more fool-proof

Also make it work if you start a new shell in a virtualenv
Simplify git aliases