alaises changed for arch
comment
whitespace change
Revert "comment" breaks things in functions

This reverts commit 094001fd6ba0dcd3ce703e96661b38a471d7eeff.
Revert "not sure what changed"

This reverts commit e8d11160ef57f8bac8bce6735dc650428e9f59ba.

Conflicts:
	plugins/functions/functions.plugin.zsh
make vimrc open .vim/config
for some reason arch still has vi, so make that vim
Merge branch 'arch' of https://github.com/yramagicman/zsh-aliases into arch

* 'arch' of https://github.com/yramagicman/zsh-aliases:
  make vimrc open .vim/config
alias .vim/bundle/.commit.sh
Merge branch 'arch' of https://github.com/yramagicman/zsh-aliases into arch

* 'arch' of https://github.com/yramagicman/zsh-aliases:
  alias .vim/bundle/.commit.sh
make bell always sound but keep alert volume muted
make python enter python2 on arch
Merge branch 'arch' of https://github.com/yramagicman/zsh-aliases into arch

* 'arch' of https://github.com/yramagicman/zsh-aliases:
  make bell always sound but keep alert volume muted

Conflicts:
	plugins/aliases/aliases.plugin.zsh
fix merge conflict
alias music sync
alaises changed for arch
comment
whitespace change
Revert "comment" breaks things in functions

This reverts commit 094001fd6ba0dcd3ce703e96661b38a471d7eeff.
Revert "not sure what changed"

This reverts commit e8d11160ef57f8bac8bce6735dc650428e9f59ba.

Conflicts:
	plugins/functions/functions.plugin.zsh