Configuration updates
More config updates
Adding -init to initialize a default config file in the current directory
Moving some things around