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.