2699w just cleanup mostly
Merge branch 'master' of github.com:chriscauley/org