Use the pytest_cmdline_main hook which happens sooner

[JamesHutchison]

Minor refactor so instead of doing session.config everywhere and not actually using the session, its just has the config.