Replace <leader> based shortcuts for exiting with Z? based ones, no need to waste a mapping on functionality already provided by vim
Updated autocmd to remove tailing whitespace in php files to execute on buffer close instead of buffer write as it was messing with undo history in vim
Merge remote-tracking branch 'origin/master'