Add vim stylus plugin
Merge branch 'master' into macosx