Added mode option to regenerate methods, allowing the ability to 'exclude' some properties from regeneration.
Upgraded MatFile to allow for additional pore and throat properties to be imported. Specifically did this to grab 'type' from matfile.
- Fixed the run script
- Removed 'numbering' from Delaunay
Added wrapper methods for creating Geometry, Fluid and Physics objects.
- Instead of calling OpenPNM.Geometry.GenericGeometry().generate()
- Just use pn.add_geometry()
- Clearly much easier and intuitive.  The connection to a specific network is now obvious.
Changes to Fluids
- Removed init_cond from init
- renamed apply_ICs to apply_conditions
- apply_conditions accepts any argument/value pairs, which are turned into fluid properties
Updates to GenericGeometry
- It now defaults to pnums and tnums = 'all'
- If pnums or tnums are sent as [] then an 'empty' geometry is created
- Also began adding a 'check_consistancy' method which looks to see if any geometry labels overlap, or if any locations do not have a geometry.
Added check to init of Geometry/Fluids/Physics to ensure an object with the supplied name does not already exist
Created test file
Fixed 2 bugs in GenericFluid
- type on _fluids
- also added occupancy = 1 up on initialization
Merge branch 'develop' of https://github.com/PMEAL/OpenPNM into develop
Merge branch 'develop' into Documentation