Fixed issue with classes containing macros.  Now the full classpath is added to the macro classpath so that macros should be able to use any of the classes on the classpath.