Squashed commit of the following:

commit f3b59f7742cc82570262656866e21271374af9fa
Author: Gustavo Medina <gustavo_medina@condenast.com>
Date:   Thu Dec 11 17:11:30 2014 -0500

    fix

commit cf2e9474e0f47427385890d547087e2e3d28a816
Author: Gustavo Medina <gustavo_medina@condenast.com>
Date:   Thu Dec 11 17:10:08 2014 -0500

    added edits

commit d45dbbae857c33856942eded8f7d72ad9756dd1f
Author: Gustavo Medina <gustavo_medina@condenast.com>
Date:   Thu Dec 11 17:09:49 2014 -0500

    added file