Ignore .tmp folders on ack by default
Add some useful git aliases for pushing and locating merge commits