Tidying up, and adding .gitignore