clean up and leap integration
Merge branch 'master' of github.com:asweingarten/TSK