make use of os.path.join / conf support added
Merge branch 'master' of https://github.com/erazor83/pyWebStory

Conflicts:
	run.py