tweaks
fix merge conflict -- use new version of x11_kb_remap
fixed keyboard remap issues
automatically reload bashrc after editing
move gitconfig to source control; prompt tweaks and vim subshell integration; etc
fix listchars
fix git aliases & other config
merge gitconfig changes
fix bashrc merge conflict
fix merge conflict .vimrc
fix bashrc git aliases
turn off verbose output
lots of files...lots of fun
fix merge conflict