More gitignore and general cleanup