Merge NYC Taxi demo edits applied to master

Bring changes previously applied to master forward into develop