Initial reintegration commit - preparing resources, appkeys, etc.
reintegration commit - PebbleKit JS + configuration page (must be hosted, currently)c.
reintegration commit - Core changes, maintained what I reasonably could easily.  The calendar drawing has been reverted as part of this because I want to integrate the improvements explicitly, but maintain the flexibility (e.g. to show just the current week so there's room for an upcoming appointment).  Never again do I not use git just because I'm under NDA - I'll chance it that I can resist the urge to push origin, next time.