a few updates
a few changes before big merge with rob
removed a couple of files
removed some files
Updated version number