updated README - make options
Fix a typo in a directory name
Merge pull request #253 from varunbpatil/help_update

updated README - make options
Merge pull request #254 from mstorsjo/directory-typofix

Fix a typo in a directory name
Merge remote-tracking branch 'upstream/master' into travis.osx