Tidy up Application XML
Fix makefile to play nice with cygwin/Windows