Minor Lintian warning fixes and double checked overrides
Fix Lintian errors. Make template refrences explicit.
Fixed man page formatting