added += operators for integers, reanabling automatic cast from integer
to doubles.
mentioned recompilePython-Conedy in the documentation
adding setTime to neuroPython
added removeRandomEdgesUndirected
Merge 10.47.9.61:/home/alex/conedy/conedyGit
fix for strange static linking behavior of g++
adde a missing minus for -static
bug fix when writing binary with observePhaseCoherence
addad test script for writing binary with phaseCoherence
Merge /home/alex/DropboxPrivate/conedy/conedyGit
fix for observeAll
bugfix
removing warnings
Merge 10.47.9.61:/home/alex/conedy/conedyGit
simplifying build of the parser. flex++ and bisonc++ are now invoked
with Make (instead of bjam)
some code cleanup, better matching for nodes, less recompiled object
files
removing unused symbols
Merge branch 'master' of 10.47.13.9:/home/alex/conedy/conedyGit

Conflicts:
	Parser.yy.tokens
slightly faster recompilation
started repairing observeAll for python-conedy