Merge pull request #447 from MIT-Mobile/3.6/dev-intrepid-svoigt

Sped up initial loading of tours data
Slight update to tours loading