Fixed merge issues, added autosave choice, cleaned up code
Merge pull request #16 from DownSpiral/master

Autosave fix