Adding marks, disabling liquidprompt for mercurial repos, adding git completion, adding sensible whitespace defaults for Java in vimrc