This seems to get things up and running again

Some nosetests still fail.