Cleaned up untracked files and updated .gitignore.
Merge branch 'master' into editor-updates