Merge pull request #17 from ackwell/master

Revert wiki plugin
Removed requests from apis
Started translating plugins to newer version of requests
Fixed googl api to use requests properly
Updated @w
Tried to fix htmlentities because wut. Gave up
Sorry htmlentities, but you weren't actually working most of the time
Updated @g and got rid of references to htmlentities
Fixed @yt's use of requests and bugs
Fixed @ud bug
Changed to .format for @tx
Finished moving to proper requests, also .format()!
Added location and unit options to @wa, new config options!
Added @wiki alias for @w
Quickfix to hanging on some urls
Merge pull request #48 from DpEpsilon/master

Merging updates