Upload script improvements
Merge branch 'master' of https://github.com/nyul/nRF_TP