Fixing some issues with jpathwatch on osx with java 7, and making the nio2 implementation match changes to jpathwatch implementation