Added regex for emails and links

Replaced the old check for emails and links with regexs. This should
fix issues 16 & 17.