hand merge of @kgorman pull request for config file and authentication