raster updated

cocotrace.py now has a raster and histogram.
Still need to verify bins of histogram, which is getting the maximum of
time
Merge branch 'master' of https://github.com/coconeuro/coco

Conflicts:
	cocoSampleScript.py
	cocoTrajectory.py
Merge branch 'master' of https://github.com/coconeuro/coco

Conflicts:
	cocoSampleScript.py
	cocoTrajectory.py