Adding self to README.
Updates affiliation and email.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Merge pull request #12 from taavi/master

Adds Taavi to contributors list, with affiliation
add some words to blockcode readme
Merge branch 'master' of https://github.com/aosabook/500lines