Squashed commit of the following:

commit 3000c8d44fc7930ef54223de17ea2620350ad177
Author: Seth Pellegrino <seth.pellegrino@jivesoftware.com>
Date:   Thu Mar 27 12:54:32 2014 -0700

    Hi mom