Fix XPM not showing due to ifdef typo, and user visible whitespace fixes
Add manpages from debian
Fix a few Makefile issues