option to control grunt.options from inital task

fixed minor typos
Add npm options
richardbutler/master merged
Merge remote-tracking branch 'kingbin/master'

Conflicts:
	tasks/subgrunt.js