Resolving conflict from cherry-picking 82597a3
using -= where appropriate

This should do the operations in-place.
Merge pull request #1 from w-m/gaussian1D

3x Speed-up