added /media to cdpath
Merge branch 'master' into bender

* master:
  added /media to cdpath
  transformed systemctl function into aliases
  add /var/run/media/$USER to cdpath
  setopt nonomatch

Conflicts:
	zshrc
Merge branch 'bender' of https://github.com/autermann/prezto into bender

* 'bender' of https://github.com/autermann/prezto:

Conflicts:
	zshrc