Some fixes
Fixes to the tmux powerline setup
Adding new SPF13 Vim settings
Updating zshrc settings
Adding vimdiff as mergetool
Updating laptop script submodule