Squashed commit of the following:

Squashed commit of the following:

commit 745e7abacedcd491ba85db67001a5695eabc2438
Author: Dan MacTough <danmactough@gmail.com>
Date:   Fri Jul 20 15:33:41 2012 -0400

    Fix whitespace
    (cherry picked from commit 8e3c60f6e82e2992744907403908e326e64620a6)

commit e17294a6c21c6a392c7c4b60e17a15650e53c7f1
Author: Dan MacTough <danmactough@gmail.com>
Date:   Fri Jul 20 15:23:16 2012 -0400

    Cherry-pick non-breaking divergent changes from v0.99.0 -- mainly, passing an  object on instantiation.