Fix typo in readme
Merge pull request #6 from pieter/patch-1

Fix typo in readme
Make sure we have an error before merging user fields

If an exception is captured from within the window.onerror handling (which can happen
if the code being run isn't wrapped in a try/catch block somehow), error will be
undefined in the TraceKit callback.
Merge remote-tracking branch 'silkapp/master'

* silkapp/master:
  Set xhr.timeout after .open, for IE.

Conflicts:
	vendor/assets/javascripts/squash_javascript.min.js