Merge pull request #20 from scribu/master

Documentation changes to go along with #18