Desktop updates
Merge branch 'master' of http://github.com/j201/vimrc