Remove trailing spaces
Clean Makefile
Merge branch 'master' into latin1-xf86