ignore temp files

.tmp and meas1, meas2...
Started work on the Keithley SourceMeter driver.

Haven't tested and not sure if the visa commands will work - I am trying
to find some documentation on the conversion of the TSP syntax (what is
the X.x.i() commands) to normal visa commands.
Update Keithley SM
Updated Keithley SM after trying to instrument

The instrument is not wanting to cooperate with me. It appears that the
GET functions (of what I've written) are working; however, the set
functions are not even executed when I hit set in the GUI. I'll have to
have a bit more of a play around with the language.
SM Update
Working (In progress) version of SM driver
Trial Version of SM driver
SM 0.0.1

Contains operational SM driver.
SM V1.0

Version ready for trial in a measurement. There are still some commands
that can be implemented such as measure resistance or power and measure
voltage (while operating as a voltage source) and measure current (while
operating as current source)
Oxford Mercury PS, initial

first version of the mercury magnet power supply driver, based on OxIns
120 model
Some 1D sweep scripts

hastily written 1D sweeps, TODO: current limiting
gitignore in qtlab_013 folder

try to ignore config files
gitignore changes

copy file to qtlab_013 and ignore instrument init
Added a maxstep and stepdelay parameter for raming up and down voltages to the auxout
improve 1d sweep

tidy it up, current limiting, volt limits
Added a maxstep and stepdelay parameter for raming up and down voltages to the auxout
Merge branch 'driver-dev' of http://github.com/samhile/QTLab into driver-dev

Conflicts:
	bilby/aff_scripts/1D.py
	qtlab_013/qtlabgui.cfg
A couple of changes to 1Dsweep
Untrack userconfig: ATTN EVERYONE - this should/might delete your userconfig.py file, copy, rename and modify the userconfig.sample.py file for your PC and setup
also removed superfluous gitignore. Try to never commit your version of userconfig.py back to the repository as it messes with other users' setups. if git seems want to do so, ignore the file using "git rm --cached <filename>".
Also, 2nd gitignore is not needed
Untrack other bits