Squashed commit of the following:

commit 68748b949613c70facb1ec7767df22e4241d4092
Author: Matt Brennan <matt@petflow.com>
Date:   Thu Jul 11 20:21:51 2013 -0400

    Things

commit 8e6ab27a3cf6b97c89b3e93c6ba9f675d5237e18
Author: Matt Brennan <matt@petflow.com>
Date:   Thu Jul 11 20:18:42 2013 -0400

    *sigh*