Fixed command line parsing, so that code which expects arguments in a peculiar order isn't confused by --conf=xxx.
Removed unneccessary check.
Merge pull request #1556 from getnikola/fixes_for_main

Fixed command line parsing when --conf=xxx is given