Big changes

Added setting rules, minor tweeks
Setting rules update
Making sure the files are correct
Merge pull request #272 from herrozerro/master

The skills and settings update