Squashed commit of the following:

commit 3a211193a1c732625ef10549f1fdfb99f602fa6d
Author: Kevin Goslar <kevin.goslar@gmail.com>
Date:   Wed May 28 21:49:08 2014 -0700

    feature_commit