Merge pull request #137 from reactjs/features/setup

Merge pull request #137 from reactjs/features/setup #286