i3 config improvements
fish config
Merge branch 'master' of github.com:vikstrous/dotfiles

Conflicts:
	config/fish/config.fish
better vim
remove extra link