Squashed commit of the following:

commit dd6ce76253fdc080f9a5a95af3861e2fefbc597c
Author: Gustavo Medina <gustavo_medina@condenast.com>
Date:   Thu Dec 11 18:09:52 2014 -0500

    dafdsfds

commit fb573d31f214805a593438fc590559126cb25f3f
Author: Gustavo Medina <gustavo_medina@condenast.com>
Date:   Thu Dec 11 18:09:40 2014 -0500

    ldfafodsfl