merge in branch with lucy's changes

Benjamin Mako Hill || Want to submit a patch?