Updates to partial merge of site.
Fixing up the gh pages to at least sort of use mock objects, master now actually hacks in rails 'mostly' correctly.   I will have to merge in at least the mock changes when that is done better in master.