removed trailing whitespace
Tweaks to demo makefiles to work with gcc 4.6.x