Some updates to website build process

Not ready and fully tested yet!