All files now live in root dir, .htaccess to remove .html ext
Merge remote-tracking branch 'upstream/master'
Clumsily fix dataset page extension
Merge remote-tracking branch 'upstream/master'
Fix upload command in Makefile
Merge remote-tracking branch 'upstream/master'
Fix makefile for real now
Merge remote-tracking branch 'upstream/master'