Filling in some env/cli unfuddling for remaining opts
Addressing some golint gripes
Starting to use reflection for upload option bits

to cut down on potential bugs (I hope!)
Using a mix of reflection and mapping for upload options

rather than the struct tags solution, as this was becoming
difficult to manage as the struct tags cannot be multiline.
Removing a bunch of unused stuff from the env package
Fix cli overlay func to use the long cli name, switch correctly
Merge pull request #49 from travis-ci/unfuddle-opts-application

Filling in some env/cli unfuddling for remaining opts