Further testing and tweaks. See ParserTest for tester input and output
Merge branch 'master' of https://github.com/jslone/apidocs