Introducing WiFi only uploading.
Fixes following @cpeterso's requests.
Merge pull request #378 from tamcap/dev

Introducing WiFi only uploading.