Changes from TMS (Jesus)
Merge branch 'master' of https://github.com/topherredden/dotvim