Output just dir with tomcat dir

For some reason, `cd` not working
Use simple git push

This means that it uses the same named branch on the remote as the
currently checked out branch when you say git push (rather than pushing
ALL local branches to their remote counterpoint)
CtrlP, Clojure and Scala tweaks

Also, always use nmap for <Leader> to try to avoid problems with <Space>
in insert mode.
Allow for custom bash settings