updated spiking main
updated spiking main

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

Former-commit-id: 472888bcaa110a663549fb8a571e027b3cb64a15
PetaVision/OpenPV,dpaiton/OpenPV,dpaiton/OpenPV,dpaiton/OpenPV,dpaiton/OpenPV,PetaVision/OpenPV,dpaiton/OpenPV,dpaiton/OpenPV,PetaVision/OpenPV,dpaiton/OpenPV,dpaiton/OpenPV,PetaVision/OpenPV,PetaVision/OpenPV