Conflicts:
	examples/heatTransfer/IO_adios2.cpp
	include/core/VariableBase.h
	include/engine/adios1/ADIOS1Reader.h
	source/CMakeLists.txt
	source/engine/adios1/ADIOS1Reader.cpp
	source/functions/adiosFunctions.cpp

helloBPWriter and timeBPWriter

Fix Variable.SetSelection(). heatTransfer adios2 writer is intentiona…

Fix Variable.SetSelection(). heatTransfer adios2 writer is intentionally broken to keep to the intended API.

Adios1 cleanup

Fix run-on list item in contributors guide

ADIOS1 Write engine, Selections, Variable.SetSelection() and updated Heat Transfer example

Tinker with setup script

Add support for building both MPI and NOMPI libs in the same build.

Fix documentation typos

Fix setup scripts to work with older git versions

Remove ADIOS.tcc from the CMakeLists.txt

This was leftover from a previous branch and has been moved into
includes.

Conflicts:
	include/ADIOS.h

Further seperation of public templates vs private templates

Move the specializations for the ADIOS class members to thier own file

Conflicts:
	source/format/BP1Writer.cpp

Conflicts:
	examples/heatTransfer/IO_adios2.cpp
	examples/hello/bpWriter/helloBPWriter.cpp
	examples/hello/bpWriter/helloBPWriter_nompi.cpp
	include/ADIOS.h
	include/capsule/heap/STLVector.h
	include/core/Capsule.h
	include/core/Engine.h
	include/core/Method.h
	include/core/Profiler.h
	include/core/Transport.h
	include/engine/bp/BPFileReader.h
	include/engine/bp/BPFileWriter.h
	include/engine/dataman/DataManReader.h
	include/engine/dataman/DataManWriter.h
	include/format/BP1.h
	include/format/BP1Aggregator.h
	include/format/BP1Writer.h
	source/ADIOS.cpp
	source/core/Engine.cpp
	source/core/Method.cpp
	source/core/Transport.cpp
	source/engine/bp/BPFileWriter.cpp
	source/format/BP1.cpp
	source/format/BP1Aggregator.cpp
	source/format/BP1Writer.cpp
	source/transport/file/FileDescriptor.cpp

Fix -DHAVE_FEATURENAME macros to actually work