Merge branch 'master' into nimbustramus-local
merge with master
my squid work ...
Merge branch 'master' into nimbustramus-local

Conflicts:
	examples/VacuumNeutrinoOscillations/vacuum.cpp
	inc/SQUIDS.h
	lib/libSQUIDS.a
	src/SQUIDS.cpp
	src/SQUIDS.o
	src/SUNalg.cpp
	src/SUNalg.o
	src/const.o