only bundle rb-inotify in linux
Merge branch 'master' into devise