Added an updated ls alias
Move the vcs info around, still not thrilled with it, but I like it better than rprompt