Fixing colorization

[MattTuttle]

Fixed some minor colorization issues with #elseif, wildcard packages, and calling new with multiple type arguments. See below:

#if condition
#elseif (foo || bar)
#end

import foo.bar.*;

var secondNowHighlights = new MyType<First, Second>();

[clemos]

Thanks !