Merge pull request #90 from gnustomp/master

ninjabot: sanitisation, preparation changes
linkinfo: don't GET redirects, show real filenames

We shouldn't be wasting time getting redirects again if we already know where a redirect leads to.
We should also show the filename we were redirected to, if we were redirected.
Merge pull request #93 from auscompgeek/patch-3

linkinfo: don't GET redirects, show real filenames
Revert "ninjabot: sanitisation, preparation changes"
Merge pull request #95 from auscompgeek/revert-90-master

Revert "ninjabot: sanitisation, preparation changes"
Fixed error when clearing already completed timers
Fixed error on some cancel_schedule calls
Private messages now set channel to sender's nick
Fixed misc.dice for py3.4+
Updated plusplus to accept ++ or -- anywhere in the line,
and no more multiple ++ in one
and no more floats
and more admin commands
Merge pull request #97 from IceDingo/master

Updated plusplus to accept ++ or -- anywhere in the line,
--
Updated paste to use new API. Now error works again
Update paste to use res.json() instead of json module
Merge pull request #98 from IceDingo/master

Updated paste.py
Merge pull request #2 from ackwell/master

Merge