PSR-2 fixes, prepare for 1.0.0 release.