about to add submodule
Merge branch 'master' of https://github.com/gbluma/typed-php
simplifying a few haskell parser rules