Pulling in the gitignore from master
Merge pull request #1394 from daviddavis/cv_gitignore

Content views: pulling in gitignore from master