Cleaning the code.
Updates.
Merge remote-tracking branch 'tbc/master'
Merge branch 'master' of https://github.com/garyfisher/GaryMoveOut_2.4.3