px4io_uploader cleanup and minor optimization

Remove redundant code
Cleanup error handling in program function
Merge branch 'master' of https://github.com/PX4/Firmware
Merge pull request #1165 from jean-m-cyr/master

px4io_uploader cleanup and minor optimization