Fix dependencies, tidy the measurement scripts

Removed scipy dependency (Curve_fit) as it fails to install in the virtual python environment.

This doesn't work either
http://stackoverflow.com/questions/2213551/installing-scipy-with-pip
as scipy fails to load the dependencies (mainly ATLAS, which is not trivial to install).