added a 1 minute timeout to require.js.
Merge pull request #616 from spenceralger/requirejs-timeout

added a 1 minute timeout to require.js.
Markers in histogram
Merge remote-tracking branch 'upstream/master'
Merge branch 'annotations'