fieldtrip module: address follow-up bug w/ #1193
calltaker module: new mailables letter template (per #1160 and related email discussions)
calltaker module: front-end changes for new mailables letter format (#1160)
Merge branch 'master' of git://github.com/openplans/OpenTripPlanner