- Tidied up paramater reading in tigscope.cxx in preparation for modifying it.
- Merging changes with upstream.

Merge remote-tracking branch 'upstream/master'
- Tidied reading of command line params.
- Reads list of files from command line, not just one.  So far only processes one, but that will be fixed in next commit.
- Removed -lNet from MidasInterface makefile as not needed on any platform and breaks compilation on Debian based systems.
- Another attempt to fix conflicts.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/TigScope.cxx
Merge pull request #32 from carlu/master

Several small changes