Ready for pull!

Ricardo,

So, I've cleaned up the code significantly, set up the #defines, and checked in a versions with the defines set so they will produce your preferred layout and look.  However, the code can be tweaked to produce a weekday mm-dd (US) or dd-mm (NON_US) version with simple defines.

I think that it is safe for you to pull if you like.

Cheers,
Tim.