This checkin it a simple rebase so I can develop on the other computer.  create_database will not work at the moment, in the middle of updates to fix the calendar/holiday issue.