fixed calculation and suite classes
Merge branch '_langer_' of https://github.com/spencerahill/aospy into abdullah
Deleted unused files