Removes oz shortcut
Merge branch 'master' of github.com:89erik/dotfiles
Changes username on server