Fix codegangsta/cli compile error

codegangsta/cli has added a new value to the Flag struct (to read input
from an environment variable), so these files no longer compile without
error.  This change revises the code in a backwards-compatible way to
compile succesfully with master on codegangsta/cli.

cc @Redundancy 


P.S. - The imports moving are from my editor's `goimports`-on-save hook.  If you find them extremely annoying let me know and I will rebase to remove them from the PR, but I figured they would probably be fine.