Clean up 404 presentation and make a distinction between page and item not found
Merge cleanups to error handling templates.

Conflicts:
	app/Global.scala
Implement proper error handling and try and add some more meaningful tests