jspm configuration adjustment
Merge pull request #1333 from guybedford/master

jspm configuration adjustment
Backing out merged pull requests in master

Backed out PRs: #1308 #1312 #1333