Pulling the hive trunk into our repo

This is just a direct pull from the community.  It shouldn't require file by file review.