Squashed commit of the following:

commit 335628c90bc24ce36734fce0b4995470feaab6d9
Author: Kevin Goslar <kevin.goslar@gmail.com>
Date:   Mon May 19 21:55:45 2014 -0700

    feature_commit