Merge tmux.conf and tmux.conf.mac
Merge tmux.conf
removed tmux screensetting
Update vim
Merge branch 'master' into mac
New git aliases
Merge branch 'master' into mac
Update vim-module
do not adopt new git-push-defaults
Update vim-module to v0.2.1
Remove OS-X only features from tmuxconf