Merge Upload and Upload using programmer options

This merges these two options, adding the normal "bootloader" upload method as just another entry in the "Programmer" selection menu. This cleans up the uploading code a bit and allows uploading using a programmer through the commandline now.