Merge branch 'master' of tardis:/dotfiles

diff --combined zshrc
index b5c6b18809e648f4e0808d99feec68a2464ff068,cd62f3fd8aa29ac26ff1f1cdf7a6838f7f971ccd..f319e498729b3fa2d3f04870522fcece247c9f0b
--- 1/zshrc
--- 2/zshrc
+++ b/zshrc
@@@ -30,7 -30,6 +30,7 @@@ setopt dvorak       # correct_all uses 
  # populate path
  typeset -U path     # make path a unique array
  [[ -d ~/bin ]] && path=(~/bin $path)
 +[[ -d /extra ]] && path=($path /extra/bin /extra/usr/bin /extra/sbin /extra/usr/sbin)
  [[ -d /opt/android-sdk ]] && path=($path /opt/android-sdk/platform-tools)
  
  # source aliases
@@@ -51,6 -50,7 +51,7 @@@ hash -d chroot_testing=/buildsystem/tes
  hash -d chroot_master=/buildsystem/master/buildroot
  hash -d chroot_lib32=/buildsystem/lib32/buildroot
  hash -d wineprefixes=/mnt/sdd5/wineprefixes
+ hash -d UniMaas=~/Dropbox/Documents/UniMaas
  
  # set some env variables
  export _gamedir=/mnt/Skaro/Games/Linux/HumbleBundle