Merge branch 'ugly-diff'

Conflicts:
	src/reqwest.js
Merge branch 'master' of github.com:leostaples/reqwest