removed tramp file from repo
added default cabal bin path to $PATH
updated hg config

Using emacs for three way merge. Added `slog` command.
updated tmux.conf

zsh is not default shell anymore. Fixed teminal info
updated emacs conf

Shows lines longer than 80 symbols.
Merge branch 'master' of https://github.com/riffm/dotfiles

Conflicts:
	.gitignore