Marker attaching

Please test the marker attaching / detaching functionality. I made a minor data API change, so please restart apache on vagrant after you pull. This will need another layer of re-factoring when the infoBubble functionality is refactored to the model level.