change uses of base to blocks
Merge pull request #686 from goodfeli/remove_base

change uses of base to blocks