Fixed compile error without USE_MPI
Modified vowpal dir in windows
Partially fixed demo system
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'origin/develop'