stop User.add before block erroring
Merge branch 'master' of github.com:scraperwiki/custard