Update the build targets to add Olimex programmer options.
Also cleaned up the ordering a bit for consistency.
Merge pull request #7 from slobrewer/master

Update the build targets to add Olimex programmer options.