Merge remote-tracking branch 'origin/cades_dev' into cades_dev_local

# Conflicts: # setup.py

Merge remote-tracking branch 'origin/cades_dev' into cades_dev_local
# Conflicts: # setup.py
d703117e · syz · 972bc0e5 · f314598f · d703117e · d703117e
Commit d703117e authored Nov 22, 2017 by syz
--- a/pycroscopy/io/translators/gmode_tune.py
+++ b/pycroscopy/io/translators/gmode_tune.py
--- a/pycroscopy/io/translators/labview_h5_patcher.py
+++ b/pycroscopy/io/translators/labview_h5_patcher.py
--- a/pycroscopy/io/translators/trKPFM_translator.py
+++ b/pycroscopy/io/translators/trKPFM_translator.py
--- a/pycroscopy/processing/feature_extraction.py
+++ b/pycroscopy/processing/feature_extraction.py
--- a/pycroscopy/processing/giv_bayesian.py
+++ b/pycroscopy/processing/giv_bayesian.py
--- a/pycroscopy/processing/image_processing.py
+++ b/pycroscopy/processing/image_processing.py
--- a/pycroscopy/processing/image_transformation.py
+++ b/pycroscopy/processing/image_transformation.py
--- a/pycroscopy/processing/signal_filter.py
+++ b/pycroscopy/processing/signal_filter.py
--- a/pycroscopy/processing/svd_utils.py
+++ b/pycroscopy/processing/svd_utils.py
--- a/pycroscopy/viz/be_viz_utils.py
+++ b/pycroscopy/viz/be_viz_utils.py
--- a/pycroscopy/viz/plot_utils.py
+++ b/pycroscopy/viz/plot_utils.py