Adding caldwell data
Merge branch 'master' into andrew
Actually fixing all (Emacs didn't wrap regex replace by default)

* tools/amp_db_create.py: