Update rakefile for deployment
Merge old layout
Update _site