CLC-1351 Link to as much of the CalLink URL as we can generate ourselves
Merge pull request #707 from ctweney/clc-1351

CLC-1351 Link to as much of the CalLink URL as we can generate ourselves