updated documentation, inconsistencies in readme
Merge pull request #102 from jonschlinkert/master

updated documentation, fixed inconsistencies in readme