fixed cigar compilation
Merge branch 'master' of https://github.com/mlund/faunus
updated scatter