merged in changes made in website

Benjamin Mako Hill || Want to submit a patch?