Greatly update project with Java 7/8, Maven, and IntelliJ project files. In the process, clean up several problematic issues