Fixed bug in assigning segments to branches when using time slices
* .gitignore: add emacs backup files