New time series, new format
Merge branch 'master' of https://github.com/dknoester/sunspot

Conflicts:
	src/sunspot.h