CS Fixes

The docblock changes match the proposed PSR docblock standard, and also match symfony's docblocking standards.
Still a few braces here and there. Only in the tests though I think.