Adding idea dir back to git, adjusting gitignore