Cleaned up new_dtopo branch 

Once this is merged into new_dtopo and checked, I think it is ready to merge into master for 5.1 release.