Cleaned up the .gitignore file.
Merge branch 'master' into ssl

Updates to .gitignore from upstream.