manually apply changes from propertybase branch
add advanced clipboard (see http://robots.thoughtbot.com/post/55885045171/tmux-copy-paste-on-os-x-a-better-future)
Merge branch 'master' of github.com:leifg/dotfiles