updated files, checking merge
Merge branch 'master' of https://github.com/skimm/dotfiles
fixed tmux layouts