git conflicts; trying some different mergetools
better mvim settings; DYLD for mysql (?)
L and H for cycling through buffers; back to sys clipboard
add place for python commands
inital add: watch for tmux sessions in progress