Fixed "incoming" and "outoging" aliases

These now use Git 1.7's @{u} token to specify
the upstream branch