use new line if prompt gets too long
moved some declarations
Merge branch 'master' of github.com:tschneid/dotfiles

* 'master' of github.com:tschneid/dotfiles:
  fixed git branch parsing
  make linking verbose