prompt tweaks (cherrypick)

Added nvim and emacs stuff

Use meld as difftool for git

Scala REPL color

Added .java-version to global gitignore and soft word wrap on plain text files in vim

Added scala plugin for vim

Updates to gitconfig and added xPath plugin to vim

git-completion and tweaks to prompt

Swiched to zsh

Initial commit