Squashed commit of the following:

commit f539fe797150386dc76d6d8cedb53c3e211aead6
Author: Kevin Goslar <kevin.goslar@gmail.com>
Date:   Wed May 28 21:35:28 2014 -0700

    feature_commit