Switch to mach_absolute_time() under Mac OS X, iOS, and *BSD which don't support clock_gettime().
Fix typo: .c -> .cc
Remove use of sed in-place mode, since it is impossible to do this in a way that is compatible with both *BSD and Linux.
Add thread affinity code for Mac OS X.
Solve type mismatch on 64-bit Darwin and gcc 4.9.
Merge branch 'master' of https://github.com/maaku/HyperDex into dev/OSX

* 'master' of https://github.com/maaku/HyperDex:
  Solve type mismatch on 64-bit Darwin and gcc 4.9.
  Add thread affinity code for Mac OS X.
  Remove use of sed in-place mode, since it is impossible to do this in a way that is compatible with both *BSD and Linux.
  Fix typo: .c -> .cc
  Switch to mach_absolute_time() under Mac OS X, iOS, and *BSD which don't support clock_gettime().

Conflicts:
	Makefile.am
	admin/pending_perf_counters.cc
Merge branch 'dev/OSX'

* dev/OSX:
  Solve type mismatch on 64-bit Darwin and gcc 4.9.
  Add thread affinity code for Mac OS X.
  Remove use of sed in-place mode, since it is impossible to do this in a way that is compatible with both *BSD and Linux.
  Fix typo: .c -> .cc
  Switch to mach_absolute_time() under Mac OS X, iOS, and *BSD which don't support clock_gettime().
Extend timing for test runner.
Update test env with RUBYLIB