rename
wqMerge branch 'master' of https://github.com/scraperwiki/scrumble
more renames
make module work