Plugin upgrades
Made gray a little darker
Added tomcat.*
Merge branch 'master' into m2