Merge git://github.com/doppelganger/gitmagic