replaced vim puppet plugin, added shortcut for quickly editing local vimrc
Merge branch 'master' of github.com:markotibold/dotfiles
Added tmux conf