add multi-return (can we find a better way to check for iterable returns?)
change formatting.py back to text.py so I can use formatting.py for IRC color formatting stuff!
Revert "change formatting.py back to text.py so I can use formatting.py for IRC color formatting stuff!"

This reverts commit 29d5276151efb1bd3c2604af47b60712a8ebd2e8.
use *args for command alises
Automated transition to removing @hook.command([]) - https://gist.github.com/daboross/5335bae8db91a7aa57c1
request-ify bukget
Merge remote-tracking branch 'origin/python3.4' into python3.4
wot
Merge branch 'python3.4' into event-changes

Conflicts:
	plugins/admin.py
Oops, missed that .-.
Merge branch 'python3.4' into event-changes

Conflicts:
	plugins/admin.py