Make Files and Environment not be mutually exclusive

Currently, commands take either an <env> or a '-f' argument but not
both. With this commit, we are allowing both args to be provided. The
behavior is expand the files passed by the '-f' flag and deploy the
objects to <env>.