Update the build targets to add Olimex programmer options.
Also cleaned up the ordering a bit for consistency.