Revert "merged master into stochastic neuron implementation"

This reverts commit bfb4da2f06e0cebef08b29d3c4d5fa5af1f12eba, reversing
changes made to f97f79e766df094a73abacfb7b7eeac93abe06a4.