Clean Up Comments
Merge branch 'develop' of https://github.com/PMEAL/OpenPNM into develop

# By Roderic Day
# Via Roderic Day
* 'develop' of https://github.com/PMEAL/OpenPNM:
  Fixed conflicts
  Semi-stable version, capillary doesn't update
  Still buggy
  Busy Friday
  RNG dict + StyleSheet update
Merge branch 'feature/FluidsModule' into develop
* It went surprzingly well
VTK works GREAT for James. See example in JTG3. >> OpenPNM.Visualization.VTK().write(pn,fluid=water)
There is no longer a need to "merge_fluid" onto the network for visualization purposes. Commented out that function for now.
Band-Aid on GenericFluid due to missing ContactAngle module. Just uncomment lines 105-107, delete line 108 in GenericFluid, and uncomment line 34 in init once ContactAngle is added.
I'll look at the IP frankenstein tonight, and make sure it still does what it's supposed to.
ContactAngle added properly
Unspecified fluid properties default to -1
* This makes the property nonsensical in all case, but doesn't break things since it's a number
* I suppose care will need to be take to not them by accident