Edits to help
Edits/corrections to help

Edits/corrections to help
More edits

More edits
Clarifications to help.

Clarifications to help.
Clarifications to help

Clarifications to help
Clarifications to help.

Clarifications to help.
Edits to help re: masking

Edits to help re: masking
SaveImages "Create Subdirectories" visibility

The "Create Subdirectories" option in SaveImages is only valid when the
saved file name is based on one of the loaded images. I made it only
become visible when the method for constructing file names is set to
"From image filename".
Merge remote-tracking branch 'upstream/master' into upstream
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
CalculateMath: Constrain result and add constant

Added options to constrain the result to particular bounds and to add a
constant value to the result.

Also furthers the fix for CP issue #422.
CalculateMath: Tests for additions
CalculateMath: Fixed based on tests

Didn't work with scalars, now does!
CalculateMath tests: Documentation added
Merge remote-tracking branch 'bioturbonick/master' into multiprocessing
Merge remote-tracking branch 'bioturbonick/push_math' into multiprocessing

Conflicts:
	cellprofiler/modules/calculatemath.py
	cellprofiler/modules/tests/test_calculatemath.py