Merge branch 'FMM' of gitlab.cosma.dur.ac.uk:swift/quicksched into FMM

Conflicts:
	COPYING
	INSTALL
	Makefile.in
	aclocal.m4
	autom4te.cache/output.0
	autom4te.cache/output.1
	autom4te.cache/output.2
	autom4te.cache/requests
	autom4te.cache/traces.0
	autom4te.cache/traces.1
	autom4te.cache/traces.2
	compile
	config.guess
	config.h.in
	config.sub
	configure
	depcomp
	install-sh
	ltmain.sh
	m4/libtool.m4
	m4/ltoptions.m4
	m4/ltversion.m4
	m4/lt~obsolete.m4
	missing