Merge pull request #252 from sahilm/master

Fix a sporadically slow test.
Fix broken link to setting up your dev environment.