Add some option documentation
Incorporate Ian's comments
Merge pull request #491 from twitter/jco/option_docs

Add some option documentation