Update to bring over Dobbs changes to GIT.  
Remove hard coding of base url in caledar function, replacing with base_url code.