19/08/2013 - Morning Commit

Further refinements to includes.  Additional tweaking of server
reporting component.