Merge remote-tracking branch 'devel/fix_cdms_dependency'

* devel/fix_cdms_dependency:
  esmps dependency on python was accidentally removed
add regression test image for mac dashboards

Need a second image for mac because vistrails won't produce the exact
same sized image as on linux for some reason.
Mac bug in cairo makes this image wrong but necessary - in interactive
use the actual image looks right.
Merge remote-tracking branch 'devel/add_mac_regression_test' into devel-master