Habari 0.8 compatibility, code cleanup
Compatibility with Habari 0.9.1.
Merge branch 'master' of https://github.com/habari-extras/keywords

Conflicts:
	README.txt
	keywords.plugin.php
	keywords.plugin.xml