Text changes for #311 and 'editor' change in #410, plus additions to .gi...

...tignore