updates from tfs git version

Moving from tfs git back to github.