Add config option to disable auto-save.. its causing problems :(