Some stuff that might upset Jackie
Merge branch 'feature/Effective_props' of https://github.com/jhinebau/OpenPNM into feature/Effective_props

Conflicts:
	OpenPNM/Algorithms/__EffectiveProperty__.py