Allow -f and -e flags together.

The purpose of this is to permit one-offs for production debugging.
Something like:

    % bin/logstash -f production.conf -e 'output { stdout { ... } }'
Merge pull request #1179 from jordansissel/improve-e-flag

Allow -f and -e flags together.