Update to adhere to PSR-2 (partially)
Update to support PSR-2 tabwidth (not actually spaces yet)
All tabs now replaced by spaces in order to adhere to PSR-2
Re-placed curly brackets to adhere to PSR-2