Merge 3pre into master

Merged in the latest changes, and got things up to date. `dumpdata.js` couldn't possibly be working but I dunno if we wanna do things that way anymore, so I didn't spend the time on it.