Backup of site on April 2, 2014 part 2

These weren't included in the first commit for some reason.