latest main combines spiking and non-spiking models
latest main combines spiking and non-spiking models

git-svn-id: http://svn.code.sf.net/p/petavision/code/sandbox@2451 7c0444ca-5550-0410-9008-faecdbe78eb5

Former-commit-id: 03a00d45bc9d6a9389593b01401e521191ef5819
PetaVision/OpenPV,PetaVision/OpenPV,dpaiton/OpenPV,PetaVision/OpenPV,dpaiton/OpenPV,dpaiton/OpenPV,dpaiton/OpenPV,PetaVision/OpenPV,dpaiton/OpenPV,dpaiton/OpenPV,PetaVision/OpenPV,dpaiton/OpenPV,dpaiton/OpenPV