Merged calendar updates, template formatting updates, README formatting ...

...update