Allow conda create with both --file and listed packages

Fixes #802
Merge pull request #804 from lidavidm/fix_802

Allow conda create with both --file and listed packages
Merge branch 'master' into feature/conda_cli_api

Conflicts:
	conda/cli/install.py