remove local copy of modules now in sites/all/modules
Merge branch 'refs/heads/master' into test