Squashed commit of the following:

commit aee673e6449ed9750439ec0b92381446b259736a
Author: Jerome Haltom <wasabi@cogito.cx>
Date:   Thu Nov 28 15:40:16 2013 -0600

    Package updates.