Correct Markdown link to rst. Fixes #169
Correct dictionary syntax. Fixes #170
Trim whitespace
Merge pull request #171 from carltongibson/post-0.8-fixes

Post 0.8 fixes