Ok, I made a bit more progress, I changed "Define RESET_ORG 0x800" to "Define RESET_ORG 0x1000" and it now runs my program 'sometimes', its pretty random, after a reset sometimes it comes back up in bootloader mode and sometimes runs my program, I guess I have to find out what switches it between the two ?.