fix merge conflict
modify event slightly to more robustly grab the originating channel, add example of regex passed into event definition
Merge branch 'master' of bitbucket.org:hlmtre/pybot
Merge branch 'events' of bitbucket.org:hlmtre/pybot
add line to event so modules can get ahold of their triggering line, add lastfm module
modify modules to take handle on their owning bot, defaulting to None. fix webwriter link. add a bare execute function to db.py
hotfix. fix db.py replace into for bare sql, fix lastfm.py so it doesnt trigger itself.
Merge branch 'events'