taffybar: initial config
zsh: fix git-prompt path
term-keys: fix scala change, remove Cosmic Sans
subversion: remove
new xinitrc and non-XFCE xmonad config
tmux: minor fix
emacs: be more flexible about missing fci-mode
Merge branch 'master' of https://github.com/league/dot-files

Conflicts:
	emacs.el