Some clean up of the build process

(Now using IntelliJ IDEA locally.)