Changes to make the miro models and plotting work.
fixed confilit in verions for merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/pyLOS_vectorized.py