Make everything be more PSR-2 codey like (still may have a few things, but it should be fairly consistent now).
Merge pull request #48 from vlucas/spaces_not_tabs

Make everything be more PSR-2 codey like