Merge branch 'barry/fix-multiple-calls-to-petscinitialize'

* barry/fix-multiple-calls-to-petscinitialize:
  PetscInitialize/TS: test multiple calls in (bad) convergnce study
  Revert bad example of multiple calls to PetscInitialize
  PetscThreadCommFinalizePackage now properly resets PetscThreadCommRegisterAllCalled to false changed an example to test multiple calls to PetsciNitialize/Finalzie
Merged in dalcinl/petscbt-lookupclear (pull request #26)

PetscBT: Add PetscBTLookupClear()
Merge branch 'jed/aijcusparse-icc'

* jed/aijcusparse-icc:
  MatSeqAIJCUSPARSE: make private functions static
  txpetscgpu: upgrade to version 0.1.0
  aijcusparse : fixed MatGetFactor and other small issues in this class
  ksp tests: new tests for ksp algorithms using aijcusparse methods
  vscatcusp : fixed compiler warnings
  MatSeqAIJCUSPARSE: white space, style issues, static and extern functions
  aijcusparse: ICC/Cholesky preconditioners

Conflicts:
	src/mat/impls/aij/seq/seqcusparse/aijcusparse.cu (PetscObjectComposeFunction usage)
DMPlex: Small fixes for geometry
Merge branch 'knepley/plex' into next

* knepley/plex:
  DMPlex: Small fixes for geometry
added gamg material to manual
Merge branch 'karlrupp/fix-cusp-mdot'
VecEqual: Updated documentation to make clear that no round-off errors are considered.
SNESLineSearchType: fix PetscEnum relic in Fortran interface
Merge branch 'maint'

* maint:
  SNESLineSearchType: fix PetscEnum relic in Fortran interface
Merge branch 'master' into next

* master:
  SNESLineSearchType: fix PetscEnum relic in Fortran interface
  VecEqual: Updated documentation to make clear that no round-off errors are considered.
Merge commit 'added gamg material to manual'
PCGAMG: add PCGAMGInitializePackage (fixes memory leak)
TS example: fix missing return from main
Merge 'TS example: fix missing return from main'

* commit '6cc1abb6d82f7eea6904f2cf84ef3bf223f75b46':
  TS example: fix missing return from main
Merge branch 'master' into next

* master:
  TS example: fix missing return from main
  added gamg material to manual
Merge branch 'madams/gamg-mem' into next

* madams/gamg-mem:
  PCGAMG: add PCGAMGInitializePackage (fixes memory leak)
PCGAMG: set subtype in PCSetFromOptions_GAMG instead of PCCreate_GAMG
AO: fix PETSC_NULL_OBJECT in aocreatebasicis_ and aocreatememoryscalableis_

Reported-by: George Pau <gpau@lbl.gov>
Merge branch 'maint'

* maint:
  AO: fix PETSC_NULL_OBJECT in aocreatebasicis_ and aocreatememoryscalableis_