Cleaning up expects and tests
Adding git rm to the generate to remote files from expects and tests
Merge branch 'master' of https://github.com/thebravoman/software_engineering_2014
Restoring to commits from before the deadline of 20:00