Addressing some golint gripes
Starting to use reflection for upload option bits

to cut down on potential bugs (I hope!)