Adding .gitignore and some cleanup