Merge pull request #87 from guybedford/systemjs

Update for SystemJS
em
fixing conflicts
systemjs fixes