Updated flux-commands file to new standard
Fixed whitespace issues
Merge remote-tracking branch 'origin/master'
Normalize line endings