Increased DPMS defaults
Merge branch 'master' of https://github.com/weslem/dotfiles
Updated vim-unimpaired