Fix XPM not showing due to ifdef typo, and user visible whitespace fixes
Fix a few Makefile issues
Add .gitignore
Make option 8 default