Made using git fetch and merge faster.

Added short aliases for fetch and merge and made merge default to
using upstream.