Changed r.js config.
Ignore 'dist' folder contents.
Fixed build.
Merge branch 'fix-build'
Fixed build for now.