Revert changes to the classpath
Merge pull request #172 from markewallace/MoreClasspathFixes

Revert changes to the classpath