Minor fixes and documentation changes
Merge pull request #318 from metamx/minor-fixes

Minor fixes and documentation changes