Merge remote-tracking branch 'origin/arch'

* origin/arch: (25 commits)
  ok maybe things will be happy now
  blah
  blah blah blah
  blah blah blah
  fix stuff
  make bell always sound but keep alert volume muted
  alias .vim/bundle/.commit.sh
  for some reason arch still has vi, so make that vim
  Revert "not sure what changed"
  Revert "comment" breaks things in functions
  whitespace change
  comment
  alaises changed for arch
  alias music sync
  fix merge conflict
  make python enter python2 on arch
  make bell always sound but keep alert volume muted
  alias .vim/bundle/.commit.sh
  for some reason arch still has vi, so make that vim
  make vimrc open .vim/config
  ...
Merge branch 'master' of https://github.com/yramagicman/zsh-aliases

* 'master' of https://github.com/yramagicman/zsh-aliases:
  fix merge conflict

Conflicts:
	aliases/aliases.plugin.zsh