add spell check
fix filetypes
Merge branch 'mary'