Merge branch 'master' of github.com:znuh/unsorted

Conflicts:
	mlx90620/main.c
	spacenav/spacenav.c
	spacenav/spacenav.h
fix merge conflicts
Merge branch 'master' of github.com:znuh/unsorted
makefile fix
minor additions
add error indicator
Merge branch 'master' of github.com:znuh/unsorted
Merge branch 'master' of github.com:znuh/unsorted
new font location