Squashed commit of the following:

commit 1848b93da0d8b0f47a9364aa3d2866c777e3dfe0
Author: Jumonji <ken.otwell@gmail.com>
Date:   Wed Jun 4 20:08:16 2014 -0400

    Tweaking