config file for terminator.
Merge branch 'master' into topic/terminator