Test master

Merging in Prasanna's changes for Graphvix issues. Also getting rid of class files... again