Update xinitrc
Update vim configuration
Update zsh conf
Merge branch 'master' of http://github.com/acieroid/dotfiles
Use marmalade as default emacs repository, turn off expectations-mode