refactored IncrementType to support both integers and floats

closes #526