Merge branch 'develop' into Logscale
Added grid to channel_plot

Added a checkbox to display grids on channel_plot.py
Revert b4361c9..8d6f19e

This rolls back to commit b4361c9758354f5c3c78709a9921a90d19994e24.
Revert "Revert b4361c9..8d6f19e"

This reverts commit 5d6340a03ad986b82ffd4c2b2c4fbc846151c6bf.
Merge branch 'Logscale' into develop
utils update
Merge branch 'develop' of github.com:project8/Pypeline into develop
Convert Lockin data to array

For some reason, the lockin data (magdata) was being passed as a tuple,
and causing the program to crash.  Now we convert it to a numpy array
before using it.  I also changed the defaults to reflect the number we
are currently using, I was tired of changing it all the time while
debugging!
Hack: repeat DPPH measurement until valid

We are having a problem where the DPPH measurement in _GetSweptVoltages
returns nonsense instead of data; I made a “hack” so that it keeps
repeating the measurement until we get data back.  We still need to
find out why it gives nonsense back.
Automatically searches for resonance

Changed the DPPH measurement to search for resonances automatically;
this prevents the user from forgetting to press the “find resonance”
button; if the range is wrong, then the result will look terrible and
it will force the user to enter a new range and search for the
resonance again.  Also, I cleaned up the status messages of dpph_utils
a bit.
updated Get to deal with latest set
Merge branch 'develop' of github.com:project8/Pypeline into develop
Merge branch 'run_automation' into develop
Merge branch 'develop'

Conflicts:
	scarab
tagging, minor version bump because I've broken lots of compatibility
Merge branch 'master' into develop
Merge branch 'develop' into run_automation