BROKEN BUILD: templated Spectrum class
BROKEN BUILD: templated Channel class
successfully templated the maracuja lib
BROKEN BUILD: more work getting the tests running again
Merge branch 'specops' of https://github.com/bumuckl/maracuja into specops

Conflicts:
	lib/CMakeLists.txt
	lib/include/maracuja/MSImage.hpp
	lib/include/maracuja/Spectrum.hpp
	lib/src/MSImage.cpp
	lib/src/Spectrum.cpp
more work expanding the functionality of Spectrum and integrating the
specops
BROKEN BUILD: mofe fun with resampling
Merged with head from master
Dunno what went wrong here