updated from files on hgwdev as of 8:50pm 9/10 so that we can go forward using git