Matched tracks with otracks as closely as possible

Next step is to merge them into one file.

	modified:   otracks.py
	modified:   tracks.py
First attempt at truly merging otracks into tracks

Allows (and implements) correlations between translation and orientation

	modified:   tracks.py