Get nosetests passing after installing --without-cython
Merge branch '2.0' of github.com:forcedotcom/distributions into 2.0