Devseed merge

@akshaysinha This will launch the latest version of the site and data. In the case of conflicts I kept our code.

/cc @smit1678 @davejohn @abdulriza