Fixed update race condition by breaking it into updateF[orces] and updateS[tate] hopefully elliminated __syncthreads issues as well
Merge remote-tracking branch 'upstream/master'
SHared and naive with flocking workinhg