Merge branch 'master' of mussel.ucc.asn.au:matches/honours

Argh what is going on

Conflicts:
	research/TCS/process.py

diff --cc research/TCS/process.py
index 85cd47f,31c98d2..f5e54b9
--- 1/research/TCS/process.py
--- 2/research/TCS/process.py
+++ b/research/TCS/process.py
@@@ -136,7 -262,7 +262,11 @@@ def main()
        #gnuplot("set term postscript colour")
        #gnuplot("set output \"test.eps\"")
        for i in range(1, len(sys.argv)):
++<<<<<<< HEAD
 +              tcs.append(Derivative(map(lambda e : [e[1], e[2]], GetData(sys.argv[i]))))
++=======
+               tcs.append(Derivative(GetData(sys.argv[i]), 1, 2))
++>>>>>>> 95832ff21f52524b602dcb863a064873555a1ee9
                #tcs.append(GetTCS(GetData(sys.argv[i])))
                if (len(tcs[i-1]) > 0):
                        gnuplot.replot(Gnuplot.Data(tcs[i-1], title=sys.argv[i], with_="lp"))