fix docs for 0.6 part 1 of many
Merge pull request #258 from metamx/fix-docs

Fix docs for 0.6 (part 1 of many)