Merge pull request #1 from jspm/master

Update master
Add react-router to registry
Merge pull request #42 from computmaxer/react-router

React router