Fixed bug 7016 & 7322

- http://hercules.ws/board/tracker/issue-7322-about-pluginsconf/
-
http://hercules.ws/board/tracker/issue-7016-skill-db-not-behaving-as-des
cribed-in-discription/

- Made /conf/plugins.conf a little bit more better to understand.
Update plugins.conf

We don't want those uncommented.
Merge remote-tracking branch 'upstream/master'