minor changes in fit.py (produced an error as soon as no y_err argument was given)
and plot.py (fit1d now includes a color option)
Merge branch 'master' of https://github.com/teamdiamond/analysis

Conflicts:
	lib/fitting/fit.py
	lib/tools/plot.py
Zeno analysis lib and Carbon repump analysis scripts
NK
Merge branch 'master' of https://github.com/teamdiamond/analysis