cleaned up file watching code a little bit, made small changes to config file format