path modifications
Merge branch 'master' of https://github.com/vranki/pajabot

Conflicts:
	bot/pajabot.py