Undone a ton of whitespace changes that my IDE made automatically but which make pull requests rather spammy...
Undone a ton of whitespace changes that my IDE made automatically but which make pull requests rather spammy...
Another whitespace fix... oops...
Merge branch 'modular-link-types'

Conflicts:
	src/Autolinker.js
	tests/AutolinkerSpec.js
Merge branch 'complex-callback-option'

Conflicts:
	src/Autolinker.js