Added work on merging CarrLab ASTRO site with HEXnet ASTRO site.

This is going to get hairy.