Re-org stuff from email
Merge branch 'master' of github.com:tommoyer/org