Merge pull request #351 from jklein/master

This is a first stab at #346 - warning on invalid command line options
drop os property from package.json
Merge pull request #352 from vomitcuddle/patch-1

drop os property from package.json
Merge remote-tracking branch 'upstream/master'