Squashed commit of the following:

commit 23ef31a64bc4a3f7f29d1182582354f335b0b618
Author: Kevin Goslar <kevin.goslar@gmail.com>
Date:   Wed May 28 21:45:08 2014 -0700

    feature_commit