Merged changes from primalpop repo.

Catching up on changes made by primalpop on his personal repo.
Note that I added an external JAR that he uses (which he forgot to add to his repo).