Merge http://github.com/twist/gitmagic