Fixed gulp watcher on windows
Improving build system