Improved file monitor mode
Merge branch 'master' of github.com:deajan/osync