Merge pull request #8 from kengu2/master

first version of local.conf implementation
Merge pull request #9 from kengu2/master

Tabs to spaces
Merge pull request #10 from kengu2/master

modular !commands - errorhandling on lightstatus
Merge pull request #11 from kengu2/master

Update bot.conf
changed init & disconnection code
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bot/pajabot.py