fixed a bug where some command line options were ambiguous.
Merge branch 'mt' of https://github.com/pmaanen/polarimeterstudies into mt

Conflicts:
	main.cc