Modified style file to cope with new AMAT tags
Better matching algorithm. Now if an AMAT Way is selected, it is used for matching. Fixes #2, #4