Refactored streams plugin to use a simple flat text file for stream names/abbreviations
Merge branch 'master' of https://github.com/andyeff/skybot

Conflicts:
	plugins/streams.py