Merge in IntelliJ + Maven support (mainly gitignore stuff) and Privacy Option packet implementation.