slighty better plan names; fixed test
Merge branch 'master' of github.com:scraperwiki/custard