settings
Merge branch 'master' of https://github.com/mferral/ispipeline

Conflicts:
	ispipeline/settings.pyc