Moving some function names
Fixed up function to go up by more than one directory
Fixed prompt to display working directory information
Added proper git color and characters
Updated vim config
Merge branch 'master' of github.com:msoucy/Dotfiles