Use explicit field names for Cli struct

Fixes for compatibility with latest version of codegangsta/cli