Cleaned up a few things, re-edited YAML config file in VIM