Kvothe: Autostart
Merge branch 'master' of github.com:raphaelm/dotfiles
vim: Emmet
Redshift, Chromium
Merge branch 'master' of github.com:raphaelm/dotfiles

Conflicts:
	vim/vimrc-master