diff --git a/aliases b/aliases
index 1c12cd8..9442940 100644
--- a/aliases
+++ b/aliases
@@ -46,11 +46,6 @@ alias devs='apachestop && mysqlstop'
 alias devr='devs && dev'
 
 
-# dandelion deployment shortcuts
-alias deploy='dandelion deploy'
-alias status='dandelion status'
-
-
 # grunt
 alias gr='grunt'
 alias grw='grunt watch'
diff --git a/install/brew.sh b/install/brew.sh
index 3b2b8dc..cf248e7 100755
--- a/install/brew.sh
+++ b/install/brew.sh
@@ -24,6 +24,7 @@ brew install subversion
 brew install the_silver_searcher
 brew install unrar
 brew install wget
+brew install youtube-dl
 
 # brew cask and install software
 
diff --git a/tmux.conf b/tmux.conf
index fcde26a..19314bb 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -21,12 +21,6 @@ set -sg escape-time 50
 # use vim motions :-)
 setw -g mode-keys vi
 
-# copy & paste shortcut
-unbind [
-unbind p
-bind Escape copy-mode
-bind p paste-buffer
-
 # reparing copy & paste
 # Setup 'v' to begin selection as in Vim
 bind-key -t vi-copy v begin-selection
@@ -36,26 +30,20 @@ bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy"
 unbind -t vi-copy Enter
 bind-key -t vi-copy Enter copy-pipe "reattach-to-user-namespace pbcopy"
 
+
 # Force a reload of te config file
 unbind-key r
 bind-key r source-file ~/.tmux.conf \; display-message "Configuration reloaded!"
 
 # Saner window splitting
-unbind %
-bind \ split-window -h
-bind - split-window -v
-
+bind-key \ split-window -h
+bind-key - split-window -v
 
 # Easier resizing
 unbind-key -n C-j
 unbind-key -n C-k
 unbind-key -n C-h
 unbind-key -n C-l
-
-# unbind ctrl-left + ctrl-right -- we use this in vim only
-unbind-key -n C-Left
-unbind-key -n C-Right
-
 bind-key -r C-j resize-pane -D
 bind-key -r C-k resize-pane -U
 bind-key -r C-h resize-pane -L
diff --git a/vimrc b/vimrc
index e8b1330..cc0649f 100644
--- a/vimrc
+++ b/vimrc
@@ -14,6 +14,7 @@ Bundle 'gmarik/vundle'
 " plugins
 Bundle 'Raimondi/delimitMate'
 Bundle 'SirVer/ultisnips'
+Bundle 'airblade/vim-gitgutter'
 Bundle 'bling/vim-airline'
 Bundle 'chrisbra/NrrwRgn'
 Bundle 'editorconfig/editorconfig-vim'
@@ -22,6 +23,7 @@ Bundle 'ervandew/supertab'
 Bundle 'godlygeek/tabular'
 Bundle 'justinmk/vim-sneak'
 Bundle 'kien/ctrlp.vim'
+Bundle 'kshenoy/vim-signature'
 Bundle 'mattn/gist-vim'
 Bundle 'mattn/webapi-vim'
 Bundle 'mbbill/undotree'
@@ -55,7 +57,7 @@ Bundle 'tpope/vim-markdown'
 Bundle 'webgefrickel/vim-typoscript'
 
 
-" Color themes
+" Color themes -- one to rule them all!
 Bundle 'altercation/vim-colors-solarized'
 
 
@@ -120,10 +122,12 @@ endif
 
 
 set t_Co=256
-colorscheme solarized
 set background=dark
+colorscheme solarized
 let g:solarized_termtrans = 1
 let g:solarized_contrast = 'high'
+" minor optical fix vor vim-gitgutter / syntastic / vim-signature
+highlight SignColumn ctermbg=8
 
 set fillchars=""
 
@@ -188,9 +192,7 @@ set timeout timeoutlen=800 ttimeoutlen=100
 " set the leader to comma , and ; == : -- faster commands
 let mapleader = ","
 nnoremap ; :
-nnoremap : ;
 vnoremap ; :
-vnoremap : ;
 
 " Swap v and CTRL-V, because Block mode is more useful
 nnoremap v <C-V>
@@ -399,6 +401,9 @@ let g:dash_map = {
   \ }
 
 
+" php syntax stuff
+let g:DisableAutoPHPFolding = 1
+
 
 " Other functions / Onload, Autocommands
 " ======================================================================