tweaks to configs and added git branch to bash prompt