Tidy up NuGet package restore

Adds some missing package entries so the restore works smoother - Build.bat should now work OOTB on a fresh clone and no longer require two builds