Keep idea/ around locally, but remove it from the repository
Add OS X and IntelliJ specific files and directories to .gitignore
Merge https://github.com/twilsonb/tor-research-framework