Added classpath to the macro classpath so that macros *work*.  This fixed a problem with using macros in a class that imports a class that is on the classpath but not in the macro classpath.