980 skill style

* Fixes #980
* Jenkins: http://jenkins.buttonweavers.com:8080/job/buttonmen-cgolubi1/259/

This pull depends on #982