tmux niceties
Merge branch 'master' of https://github.com/mikewadsten/vim-renaissance
Fix some conflicts. Remove hard-time because I like it easy.