not sure what this was, but we're not using it anyway
Merge branch 'master' of github.com:geosanders/Calcu