Squashed commit of the following:

commit 636ce96919b391d427d630a4223dab826c925b5c
Author: Kevin Goslar <kevin.goslar@gmail.com>
Date:   Wed May 28 21:16:48 2014 -0700

    feature_commit