fix branching in particle

also fix spacing in cinder.py
get rid of underscore variable
Merge pull request #565 from crbates/fix_stuff

fix branching in particle