Push some hard-coded file paths; requires DATA_DIR be set in settings.py

Also random other tweaks