logging memory now credits to all ancestors
keep separate count of object memory and memory of all children
don't print memory amounts
hdf5 installed without zlib should configure without zlib so first check if without zlib works
hdf5: fix so that -Lpath is also used in hdf5 lib check. [fixes --download-hdf5]
name of configure generated include file confdefs.h did not match name printed in configure.log of conftest.h
DMPlex: Fix memory leak with refinement
new location for CUDA on the Mac
Merge branch 'master' of bitbucket.org:petsc/petsc
Merge branch 'master' after racy merge

* commit 'HEAD@{1}':
  new location for CUDA on the Mac
put back in flop counts for VecNorm_Seq
Merge branch 'barry/fixseqnormflopcount'
Merged in barry/fix-conftest-h (pull request #72)

name of configure generated include file confdefs.h did not match name printed in configure.log of conftest.h
Merge branch 'barry/fix-conftest-h'
Merged in barry/fix-hdf5 (pull request #67)

hdf5 installed without zlib should configure without neededing zlib dependency
Merge branch 'barry/fix-hdf5'
Merge branch 'barry/improve-memory-logging'

Conflicts:
	src/ksp/pc/impls/redundant/redundant.c
	src/mat/interface/matnull.c
Merge branch 'maint'

* maint:
  hdf5: fix so that -Lpath is also used in hdf5 lib check. [fixes --download-hdf5]