Prompt Tweak and .vimrc Tweaks

Changed my prompt to show my current branch if I'm in a folder
containing a git repository.
Tweaked .vimrc to by default show line numbers and leave the status
line visible at all times.