forgot to check in for a long time
Merge branch 'master' of github.com:R-crmda/R-crmda
rockchalk is no longer here! SEPARATE git