remove a couple of references to posix_tim
remove asio.hpp from public header file
Merge branch 'master' into logan