Reverted to (hopefully) working version
DAC emulator
Removed old version
fix endianness problem
.gitignore for .pyc files
Merge branch 'master' of https://skynet.physics.ucsb.edu/git/labrad-servers
Tony's PNA server
typo in ping print statement
Fix sloppy unit handling
remove debugging statement
Fix units for current limit
MKS server was broken in several ways.
Update the GPIB server to support clear() and termchars()
and make SR780 use them.  Signed off by Peter
unit fixes in the wrong branch
Deleted stupid files
Merge branch 'units_fix_servers' into fixing_units

Conflicts:
	GHzDACs/Cleanup/adc.py
	GHzDACs/Cleanup/dac.py
	GHzDACs/Cleanup/fpga.py
	GHzDACs/adc.py
	GHzDACs/dac.py
	GHzDACs/ghz_fpga_server.py
	GHzDACs/util.py
	gpib_server.py
	lakeshore218.py
	lakeshore370.py
Merge branch 'fixing_units' of https://github.com/martinisgroup/servers into fixing_units

Conflicts:
	ADR/compressor_server.py
	GHzDACs/Cleanup/adc.py
	lakeshore370.py
Undo changes to GHzDACs
Remove unneeded file
fixed units in PNAX server