Added config for `thyme`, a console Pomodoro timer..

https://github.com/hughbien/thyme
Integrate the thyme Pomodoro timer in tmux
When pulling in changes, rebase the current branch, but pass --preserve-merges along to git rebase so that locally created merge commits will not be flattened.