Display shortcut when saving. Fix shortcut label after reset
Merge branch 'master' of https://github.com/vanubi/vanubi