Squashed commit of the following:

commit 70f27e70b82775a35c88c740e59f3308598b1655
Author: Will Holcomb <wholcomb@synaptian.com>
Date:   Sat Apr 13 15:34:12 2013 -0400

    completing iteration #3