Autosave/save split

Tried to conform to your style as best I could. Hopefully I didn't miss anything. Not clear if this change merits a new test or not.

Also slipped in a fix to your test code to make the linter stop yelling at me when I ran ```jake test```