Various updates
Merge branch 'master' of https://github.com/sosterwalder/dotfiles

Conflicts:
	bash/bashrc.symlink
	clementine/clementine.conf.symlink
	tmux/tmux.conf.symlink
	vim/vimrc.symlink