Restored rick shaw demo and ensured event annotations can be passed as natural datestamps