Changes to standard_run.py
Merge branch 'master' of github.com:smilefreak/MerrimanSelectionPipeline

Conflicts:
	selection_pipeline/standard_run.py