Merge branch 'theory-rewrite'
authorAaron Zauner <azet@azet.org>
Mon, 23 Dec 2013 20:28:04 +0000 (21:28 +0100)
committerAaron Zauner <azet@azet.org>
Mon, 23 Dec 2013 20:28:04 +0000 (21:28 +0100)

Trivial merge