Merging back.
Adding more stuff to .gitignore