boostrap has moved from @twitter/boostrap to @twbs/bootstrap
Merge pull request #1212 from modilabs/update-boostrap-link

boostrap has moved from @twitter/boostrap to @twbs/bootstrap
Added CORS to /api endpoints
Merge branch 'master' into cors_on_api_endpoints