integrate more recent VS Web Essentials changes