submodule update
shell-aliases for git
ZSH-prompt contains time instead of line number
vim: higlight trailing white space in all files
update submodules
Merge branch 'master' into macos