add .gitignore and untrack some gitignore'd files
Merge branch 'gitignore'