Shortened english wikipedia URIs
Fixed 4chan thread URI format: /res/ -> /thread/
Revert "Fixed 4chan thread URI format: /res/ -> /thread/"

This reverts commit 32e4c5b3459415fabcbc80fd2825382a93c10cbc.
Merge pull request #23 from ScottSteiner/urls.py

Fixes bug where filesize is not retrieved when disabled_commands is not set
Merge pull request #22 from ScottSteiner/gcalcbug

gcalc fixes
Merge pull request #21 from ScottSteiner/MetaCriticScore

Fix parsing of metascore
Merge pull request #19 from ScottSteiner/wikititle

Remove article title from output
Merge pull request #18 from ScottSteiner/ignorebug

Fixes ignore bug #11
Merge pull request #15 from ScottSteiner/media.py

Add new hooks to tv functions
Merge pull request #13 from ScottSteiner/4chan

New 4chan thread URI format
update
minor updates
Merge pull request #25 from ScottSteiner/times

New 'times' function to show the time in different time zones
Merge pull request #24 from ScottSteiner/time.py

Fixed collision between time function and imported time library, which broke .beats
Merge pull request #20 from ScottSteiner/PartBug

Fixes part bug when bot is not on a channel
Merge pull request #17 from ScottSteiner/adminnick

More flexible owner protection from kicks and bans
Merge pull request #10 from ScottSteiner/upstream

Shortened english wikipedia URIs
added .daki to hug
Pauses before rejoining to prevent being /killed
Merge branch 'rejointimer' into steiner