Merge pull request #1 from corick/master

Pull request!
Style changes (mostly through GNU Indent)
getting ready to pull
Pulling from jenkinka/block

Merge branch 'master' of https://github.com/jenkinka/block
Working on writeup.