Updated readme.
Merge branch 'master' into tests
Made first db-based nosetests work.