Propagate plotting to full waveloc tests (ongoing)
Merge branch 'u-grid' of https://github.com/amaggi/waveloc into u-grid

Conflicts:
	PyProgs/locations_trigger.py
	PyProgs/migration.py
	PyProgs/plot_locations2.py
	PyProgs/plot_options.py