Pull site setup from Toufic

@TouficS is this good to go?
I'll probably move around the files a bit after we merge these changes in.