Better support for future update to 1.7.10

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.

I'm not sure what the plan is for supporting either 1.7.2 or 1.7.10 (or both); this should help regardless.