Bring save/save as text back, close #202
Merge branch 'master' into oauth