Fix first save to prompt for name
Merge branch 'master' into gh-pages