Merge branch 'release/2013.08.13.1'
Merge tag '2013.08.13.1' into develop

First two tools.
sqitch_edit - Edit all three sqitch files in subl for a change.
sqitch_plan_merge - Set the merge rule to union for a sqitch.plan file.