Increment fields should respect null values (fixes #528)
refactored IncrementType to support both integers and floats

closes #526