Clean up and order gitignore