Fix set up instructions in readme.
Merge branch 'master' into development