Merge pull request #158 from asymptotic/master

fixing bug in email link extraction picking up extra characters
Web Interface
Merge pull request #159 from kevthehermit/web

Web Interface
Fix first load and Bottle Version
Merge pull request #162 from kevthehermit/web

Fix first load and Bottle Version
Merge remote-tracking branch 'upstream/master'