Map cmd-s and ctrl-s to save to reduce annoyance (and a little cleanup)