Added more parser tests and a minor parser refactoring
Merge branch 'lee-dev' of github.com:lnewson/csprocessor into lee-dev

Conflicts:
	csprocessor/src/test/java/org/jboss/pressgang/ccms/contentspec/processor/ContentSpecParserTest.java