cleaned up autoload.xml from merge and added classes from compile.xml, refs #315