cleanup
Merge branch 'master' of https://github.com/dr1s/terminator