brought back color aliases, added git pull -r shortcut