remove shelljs dependency from gh-pages deployer
add new output to argument parsing
Merge branch 'master' into args

Conflicts:
	lib/arg_parser.coffee