PSR-1 and PSR-2 compatibility

I've tweaked the plugin so it's compatible with the [PHP-FIG's standard/guide](http://www.php-fig.org/). 

Feel free not to merge if you don't like it.