Improve url parser
Merge branch 'master' of https://github.com/lanodan/scripts

Conflicts:
	IRCBot/.IRCBot.py.swp