Squashed commit of the following:

commit 87e63620accc6dc7a4386e3a91affbd89438e707
Author: Matthew Grill <hello@nuarmy.com>
Date:   Thu Feb 28 12:50:46 2013 -0800

    Restyle