Merge remote-tracking branch 'refs/remotes/david/master'

Conflicts:
	Makefile.am
	README.md
	configure
	configure.ac
	include/ff_wrapper.hpp
	include/hypersleep.hpp
	include/tickval.hpp
	test/hftest.cpp
	version.sh