Formatted everything the way google likes it to be formatted. Also, I checked to make sure I didn't screw anything up in that whole merge/rebase/revert fiasco that just occured