updated gitignore to ignore crap like settings
Merge to update gitignore