added misc
Merge branch 'master' of https://github.com/JoshDaly/TrackM

Conflicts:
	setup.py
Melded import interface to new condition structure
Viewinterface to new condition structure