Re-uploading Jon's gitignore, with my personal changes added in.