Version2

Merging in work for version 2 of Jekyll based HICAP site.