Phpdoc cleanup
PSR-2 cleanup
Add missing pre_content property
Merge pull request #12 from Synchro/master

Various cleanups