cleanup gitignore
Add missing files
Merge remote-tracking branch 'sm/master'