Added aliases for various git commands.
Merge no longer fast forwards by default.