updates from Rob for TechEd
Merge pull request #1380 from mollybostic/master_0430

updates from Rob for TechEd