Another stupidity fix
Replaced old iteration timer with MPI_Wtime, because the timer is reporting cpu_time which makes it look like threading makes everything slower and does not work at all on BG/Q.
made time go forward again
added '},' to a bunch of the water input files
Ah the real problem with the water inputs was missing commas.
Added a wrapper that forces use of MPI Wtime inside time.cxx
 Possible fix for misconfigure on Tukey
Merge branch 'master' of https://code.google.com/p/aquarius-chem
Merge branch 'master' of https://github.com/devinamatthews/aquarius

Conflicts:
	src/util/iterative.hpp
	test/water_clusters/make_input.py