CareyH/sally: Convert to 2.18

closes #441