Merged z3 refactoring from unstable

Squashed commit of the following:

commit ad87c0e373eb4111274cb541217b4598fe4db26f
Merge: e5e4890 519e87e
Author: Ari Fogel <thedatamatrix@gmail.com>
Date:   Wed Jul 30 13:33:15 2014 -0700

    Merge branch 'master' into unstable

commit e5e4890048dd742b93076c9484c00443ed55d5a6
Author: Ari Fogel <thedatamatrix@gmail.com>
Date:   Wed Jul 30 13:33:08 2014 -0700

    finished z3 synthesis refactoring

commit cdd330975f34ffe9192cb4a625da509ed85cc7f3
Author: Ari Fogel <thedatamatrix@gmail.com>
Date:   Wed Jul 30 15:24:04 2014 -0400

    still in process of refactoring z3 generation

commit eb56f2b0afb330d8ea34db747298b9fb1c56e087
Author: Ari Fogel <thedatamatrix@gmail.com>
Date:   Tue Jul 22 18:31:54 2014 -0700

    in process of refactoring z3 generation

commit 442307ba213e02050bf28d1c4865f4220478c789
Author: Ari Fogel <arifogel@ucla.edu>
Date:   Tue Jul 22 11:52:22 2014 -0700

    added some semantics

commit 683a089a69e442ef87d9a515ac3585b0e1dcf9c5
Author: Ari Fogel <thedatamatrix@gmail.com>
Date:   Mon Jul 21 12:48:48 2014 -0700

    started adding z3 node classes
Merge branch 'master' into unstable