Improved OS X support

Conflicts:
	src/libfaketime.c