Add residual pores and throats to OP
don't print failed amalgamated data
Merge branch 'develop' of https://github.com/TomTranter/OpenPNM into develop
Merge branch 'develop' of https://github.com/PMEAL/OpenPNM into develop
no message
Fix bug in inter_leave data that converted bool to object if data not present in all geometry
Start to add residual pore functionality to OP, tidy up amalgamate_data and change the pore selection on Delaunay - something more robust and configurable needed in future
Merge branch 'develop' of https://github.com/TomTranter/OpenPNM into develop

Conflicts:
	OpenPNM/Algorithms/__OrdinaryPercolation__.py
	OpenPNM/Utilities/misc.py
Finalize interleave_data logic and update doc tests
Merge branch 'develop' of https://github.com/PMEAL/OpenPNM into develop
Merge pull request #271 from TomTranter/develop

Fix to interleave, updated doctests and change to OP