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 · 972bc0e5 · 972bc0e5
Commit d703117e authored Nov 22, 2017 by syz
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.BESHOmodel._reformat_results.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.BESHOmodel._reformat_results.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.BESHOmodel._set_guess.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.BESHOmodel._set_guess.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.BESHOmodel._set_results.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.BESHOmodel._set_results.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.Model._create_fit_dataset.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.Model._create_fit_dataset.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.Model._create_fit_datasets.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.Model._create_fit_datasets.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.Model._create_guess_datasets.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.Model._create_guess_datasets.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.Model._get_data_chunk.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.Model._get_data_chunk.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.Model._get_guess_chunk.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.Model._get_guess_chunk.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.Model._is_legal.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.Model._is_legal.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.Model._reformat_results.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.Model._reformat_results.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.Model._set_memory_and_cores.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.Model._set_memory_and_cores.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.Model._set_results.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.Model._set_results.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.be_loop_model.BELoopModel._create_fit_dataset.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.be_loop_model.BELoopModel._create_fit_dataset.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.be_loop_model.BELoopModel._create_guess_datasets.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.be_loop_model.BELoopModel._create_guess_datasets.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.be_loop_model.BELoopModel._create_projection_datasets.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.be_loop_model.BELoopModel._create_projection_datasets.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.be_loop_model.BELoopModel._get_data_chunk.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.be_loop_model.BELoopModel._get_data_chunk.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.be_loop_model.BELoopModel._get_dc_offset.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.be_loop_model.BELoopModel._get_dc_offset.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.be_loop_model.BELoopModel._get_guess_chunk.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.be_loop_model.BELoopModel._get_guess_chunk.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.be_loop_model.BELoopModel._get_sho_chunk_sizes.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.be_loop_model.BELoopModel._get_sho_chunk_sizes.examples
--- a/docs/_autosummary/backreferences/pycroscopy.analysis.be_loop_model.BELoopModel._guess_loops.examples
+++ b/docs/_autosummary/backreferences/pycroscopy.analysis.be_loop_model.BELoopModel._guess_loops.examples