updated requirejs timeout
updates for 5/6
Merge branch 'master' of http://github.com/ietterkea/aaa-gulp