Made output easier to override.  Added alternate layouts, new date display option.
Merge pull request #5 from routinet/master

Made output easier to override.  Added alt. layouts, new date display option