The adjacency matrix was corrected in order to account for aromatic bonds. There was also other corrections to the condition statements to set the node priorities. This corrections fix bug 3562476.

Signed-off-by: maclean <gilleain.torrance@gmail.com>
Reformatting patch

Change-Id: Id835e0260bac0092ba2e6306fa817fb4a2e457bd
Signed-off-by: Egon Willighagen <egonw@users.sourceforge.net>