Also includes some cleanup of unnecessary files in .gitignore which should belong in a global .gitignore.
