Better support for future update to 1.7.10

I got my branches under control now. This will fix many of the build errors encountered for 1.7.10, but are completely supported and tested on 1.7.2. I also added IntelliJ files to the .gitignore.