Add two more keyword types and add many many more keywords.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3023 ea778897-0a13-0410-b9d1-a72fbfd435f5