added user details to local branch
fixed merge conflict with user details
enable git autocomplete and displays git branch in PS1
manual merge bash addon update from master
merged in from master
added a runn function to run a task n times sequentially
Merge branch 'master' into local
added VimExplorer plugin
vim open file where last left off
Merge branch 'master' into local
default matches master
made text color work on linux and mac
moved bash color out into a new file.  Made bash color work on linux as well as mac