Merge branch 'development'
Releasing version 1.4
New version of jquery.linkify, with correction for IP addresses and links with the '@' character.
Targets issues #2 and #3
Merge branch 'master' into development
Merge branch 'linkify' into development