Add better link behaviour
Merge branch 'Bug-31' of https://github.com/leon-vv/zenpen
Clean up url parsing code slightly, to standards