fixed interspersed pore types and throats
Merge branch 'feature/FluidsModule' of https://github.com/PMEAL/OpenPNM into feature/FluidsModule

# By jgostick
# Via jgostick
* 'feature/FluidsModule' of https://github.com/PMEAL/OpenPNM:
  Conversion of remaining files to the Fluid object approach
  Cleanup of file cruft in directories