more cleanups
more cleaning up
Merge branch 'browserid' into browserid-sad