Merge pull request #6 from chrisseaton/maven-fixes

Remove references to non-existent tests in pom.xml.
Flushing older changes and will commit fixes based on fallout
Merge branch 'master' into parser-fixes
Remove unary @ in getDecoratedName.