Update
Merge branch 'master' of https://github.com/Gnouc/dot_config_file