Brought in changes from ccraig7 branch
Cleanup, added missing cleanup.sh
taking class files out of repo
Started Query, added field number to docIDs
Merged with master