making migration
update for systemjs
Merge pull request #87 from guybedford/systemjs

Update for SystemJS
em
fixing conflicts
systemjs fixes
Merge pull request #88 from guybedford/systemjs

SystemJS fixes
updating with System.js