Multiple Parser Fixes

I've merged all your changes from the master into the multiple-parsers branch, and then added php 5.6 to the travis.yml file.


---

Also, php parser will release `v1.0.0` this September if all goes to plan. Are you up for me sending an pull to the multiple parsers branch for that too?