updated Settings.parse_args() to reflect latest usability decisions
Merge remote-tracking branch 'origin/master'