Don't check for aromatic atoms before checking charge. Carbon, 'C.plus' cation can also be aromatic and so the charge types should be checked first.

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