Move command line processing into bootstrap.py