conflicts solved
Merge branch 'master' of https://github.com/libantioch/antioch into photochemistry

Conflicts:
	src/kinetics/include/antioch/reaction.h
	src/parsing/include/antioch/read_reaction_set_data_xml.h
	test/Makefile.am
Forgotten to multiply by the bin length...
Bug fixed
Particle flux setable at the KineticsEvaluator level.
Merge branch 'master' of https://github.com/libantioch/antioch into photochemistry

Conflicts:
	src/Makefile.am
Merge branch 'master' of https://github.com/libantioch/antioch into photochemistry
merging done
Template antioch_version for basic_ostream usage

Reworks antioch_version_stdout to delegate to antioch_version.  New
antioch_version accepts any templated basic_ostream you like, avoids
repeatedly flushing the stream via std::endl, and returns the stream for
later use.

Result is, caveat build time, identical on my system.

Desirable as dumping version information to a ostringstream can be handy
at times.
Merge branch 'master' of https://github.com/libantioch/antioch into photochemistry
Merge pull request #31 from RhysU/version_ostream

Template antioch_version for basic_ostream usage
Get test-suite.log from the right directory
Add Travis-CI build status image
Merge branch 'master' of https://github.com/libantioch/antioch into Planet
Additionnal tests
  - a non null condition for photochemical rate (in case rebinning fails
    in zero)
  - a test to check rebinning (only equality)
Merge branch 'master' of https://github.com/libantioch/antioch into photochemistry
Merge branch 'photochemistry' into Planet

Conflicts:
	src/Makefile.am
	src/kinetics/include/antioch/reaction.h
	src/parsing/include/antioch/read_reaction_set_data_xml.h
	test/Makefile.am