Squashed commit of the following:

commit f79724cf71a2fe344746823e9b462d46654f1b48
Author: Jonathan Otto <jonathan.otto@gmail.com>
Date:   Wed Nov 19 17:28:03 2014 -0800

    fixup

commit d7d2d512c29eb390326694a2734f2df11f37a82b
Author: Jonathan Otto <jonathan.otto@gmail.com>
Date:   Wed Nov 19 17:27:24 2014 -0800

    doing some work