JC: fixed ERB bug in new/edit. Spec passes.