Avoid escaping in the templates (no need for them in the console).
Add --force-latest flag to allow conflict resolution, #214.
Simplify util/save.
Fix some minor issues, closes #214.
Update change log.
Bump version.