Fixed pores/throats num_pores/num_throats bug
Merge branch 'feature/better_props' of https://github.com/PMEAL/OpenPNM into feature/better_props

Conflicts:
	OpenPNM/__Core__.py