Took out merge conflict indicators again
Merge branch 'master' into SpatialPooler_Ongoing_Dev