PHPStorm Suggests keeping the .idea folder tree, but not user specific files
git is being weird...