More refactoring, Temproom removed.
Merge branch 'master' of https://github.com/Ideae/OrbIt.git