Made changes to merge VisualStudio2015UltimatePreview from alexinslc.

Please review and let me know if you see anything that looks inconsistent or wrong.