Addresses issues 8 (topnav jcr:primaryType), 11 (200 status for 404 error)

Feel free to cherry pick commits individually. Issue 11 is contestable, but I will fully admit that this has caused issues with healthchecks and has other ramifications (crawlers not acknowledging it as a not-found)