Fixed requirejs mappings
Fixed requirejs mappings
Merged downstream changes
Fixed merge issue
Merge pull request #1 from ReubenBond/master

Fix peripheral files require of main Rx library using mapping.