Switch to a two-line prompt
Tweaks
Merge branch 'master' of https://github.com/tdenkinger/dotfiles