Vtp now works with new amalgamate.
removed a debugging print command
Created __Vtp__ version of Vtp so that we can choose a format at the teleconference.
Added 'total' to the IP end condition (thanks Jon!!!).

Cleaned up ip_demo.
Set up Vtp functions to take fluids = [] || air || [air] || [air,water]
small change to output file
Merge remote-tracking branch 'upstream/feature/NewPNM' into develop

Conflicts:
	OpenPNM/Visualization/Vtp.py
	run_script.py