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
Clarification to help
In-proc imageJ on Mac / bundle rhino javascript engine
Merge branch 'master' of git://github.com/CellProfiler/CellProfiler
Removed unneeded synchronization functions, removed inter-process bridge tests
sorry, more bugfixes to nose plugin
run_script converts java.lang.Number types to python numbers + tests, python -m bioformats will give you a PyCrust with JVM loaded, killjavabridge calls os._exit at end... some thread keeps running.
For tests, mac needs a different way to run the event loop. Found some functions in imageplus that did AWT stuff not on the main thread.
Parameterized plugins need to be run on main thread in Mac
Add MCT to global methods list
Event loop / deadlock prevention for Mac / bugfix to loadimages for movies
issue # 431 - added display_error_message to errordialog - mimics a message box.
Cosmetic fixes to error message dialog that somehow didn't make it in the last commit
issue #437 fall back to something reasonable for derived images