working on improved dpph/lockin communication
Merge branch 'develop' into more_dpph

Conflicts:
	pypeline/scripts/dpph/dpph_utils.py
lockin setup has raw writes for the sequence that works on telnet, still getting tcp timeout when trying to receive data
dpph scrip fixed for new dipline behavior
Merge branch 'more_dpph' into develop