Implementation Attempt #2 for nav-parser.
Merge branch 'master' of https://github.com/appacitive/appacitive.github.com