Skill synergy half-complete

* Completed skill synergy in the skills generator
* Still need to complete that (and other tests) for feats generator