Standardize "block" usage

This commit standardizes on the use of `block` over `blk`. I found the usage of
both in the code.
Merge pull request #302 from catsby/blocks

Standardize "block" usage