added git 'up' alias for merges and moar rainbows