Clean up opline refactoring
Merge branch 'master' of https://github.com/ircmaxell/PHPPHP