Cleaned up the logic around classloading
Merge pull request #143 from cdow/classloaders

Cleaned up the logic around classloading