some infrastructure changes
Merge branch 'master' of github.com:boyers/mango