Squashed commit of the following:

commit 46359b5a61b55501e58ca2a3c92fb127a9d1ceba
Merge: a174379 870e402
Author: Carlos Gadea <carlosg@crowdtap.com>
Date:   Fri Sep 19 15:43:29 2014 -0400

    merge

commit a1743791c2936591af1f559369457071f32533ee
Author: Carlos Gadea <carlosg@crowdtap.com>
Date:   Fri Sep 19 15:39:16 2014 -0400

    random

commit cf71592e43ded2ad2db35d573a07e7e4d8739569
Author: Carlos Gadea <carlosg@crowdtap.com>
Date:   Fri Sep 19 14:58:04 2014 -0400

    wip