windup/windup — pull request #347 by jsight (2014-11-07 04:41:52+00:00)
Title: Some work on building more complex queries and conditionals

DO NOT MERGE (not that you would, this code is awful at the moment) -- This is a preliminary work in progress