Merge jdong; mostly functional testing work

Benjamin Mako Hill || Want to submit a patch?