Expand .gitignore for Windows and OS X
Add the star back
Merge pull request #724 from mc10/gitignore

Expand .gitignore for Windows and OS X