Revert "Had a bunch of issues with the project and Gradle...hopefully this didn't break anything for other people."

This reverts commit 35267ee6cca74f16d0689d8372929450fd2848b6.
Try again to fix gradle.