Update devel branch to trunk

Didn't touch settings.py or settings_local ... may need modifications to
be runnable.