Merge pull request #135 from morenoh149/patch-1

add instructions for using tmux built-in layouts
vimrc and vimrc bundles local.
Merge remote-tracking branch 'upstream/master'

* upstream/master: