Fixup --help on intensities.

Current help contains conflict statements regarding intensity
priorities.

Per commit d11df698d141988491494aa1f29c7d3595e9712b:
- rawintensity overrides both xintensity and intensity
- xintensity overrides intensity
Merge pull request #106 from sshimko/master

Fixup --help on intensities.