commit 78872b3ace0108fc7dbd32149ab5a9363c5faafe Merge: 8f5f590 8674d78 Author: Matt Traudt sirmatt@ksu.edu Date: Wed Jun 6 21:43:59 2018 -0400

Merge branch 'issue159' from juga, thanks!

sbws/config.default.ini | 1 + sbws/config.log.default.ini | 23 +++++++++++++++++------ sbws/util/config.py | 6 +++++- 3 files changed, 23 insertions(+), 7 deletions(-)