Merging updates to live

@mathiasbyens, @jakearchibald, @agektmr merging updates to the live site.