support a .gitconfig.local file

for now, includes osxkeychain-specific stuff - requires git 1.7.10
Revert "remove .tmux.conf"

This reverts commit ebbb05037207a14b66f6951b38f1da14f97fe819.