Update from work computer
Merge branch 'master' of http://github.com/mjArcher/dotvim