Squashed commit of the following:

commit b22ec9b7d4c26080d8ba8a92df87a8456c326dee
Author: Stella Tigre <stella.cannefax@gmail.com>
Date:   Fri Mar 7 13:07:09 2014 -0600

    Fixes all the indentation issues.