Temp commit to merge zachs new changes
Merge branch 'master' of github.com:ccarlton/WhatWhere
Fixed the TN data provider and map template to correctly update points instead of creating new markers for the same object. Pulling zachs changes before some refactoring.
Merge branch 'master' of github.com:ccarlton/WhatWhere