merge branch 'master' of github.com:smilefreak/MerrimanSelectionPipeline
merge branch 'master' of github.com:smilefreak/MerrimanSelectionPipeline

MerrimanLab/selectionTools,MerrimanLab/selectionTools,smilefreak/selectionTools,smilefreak/selectionTools,MerrimanLab/selectionTools,smilefreak/selectionTools