added age and maxSens options
merge with colorModel
added OD option to model
minor change
Merge branch 'JOSA'

* JOSA:
  fixed S OD from 0.3 to 0.33
merge with new base commits
added more options to plotModel
changed SHOW default to True
fixed min lambda