Use default python vim syntax
Merge branch 'master' of github.com:fcforrest/conf