Typos in incremental code
State today, incremental working, but bad
New incremental code, mixed with old
State NOW, nothing works
First steps to mapping
Merge branch 'master' into working

Conflicts:
	src/mapping.c
	src/sensor/incremental.c