clintbellanger/flare — pull request #804 by dorkster (2012-08-16 20:08:49+00:00)
Title: Complete some minor TODOs

Also cleaned up a few TODOs that had already been completed.