Merge branch 'develop' of https://github.com/libbyshoop/csinparallel into develop

Conflicts:

dev/modules/MonteCarloSimulationExemplar/build/doctrees/environment.pick
le
	dev/modules/MonteCarloSimulationExemplar/build/html/searchindex.js

modules/MonteCarloSimulationExemplar/build/doctrees/Introduction/Introdu
ction.doctree

modules/MonteCarloSimulationExemplar/build/doctrees/Plinko/PlinkoGame.do
ctree

modules/MonteCarloSimulationExemplar/build/doctrees/RouletteSimulation/R
ouletteSimulation.doctree
	modules/MonteCarloSimulationExemplar/build/doctrees/index.doctree
	modules/MonteCarloSimulationExemplar/build/html/Plinko/PlinkoGame.html
Merge branch 'master' into develop
Improvements to module description, Nov. 2014
Merge branch 'develop'