- cleanup and SmartGit
Merge branch 'ben'