Phpdocs

Just noticed I have one of the commits from #873 in here. My forked master must have been sitting on the wrong commit, let me know if it's a problem and I can go back and cherry pick off the top commit

Otherwise, just a few PHPDocs / psr2