moved things around to be slightly more sane
tweaked a few things to make variations and ajax loading work
Fixed merge group bug
Added raw static caching