Cleaning up options documentation. Adding defaults and creating better consistency.

Closes gh-20.