Add support for Amazon OS
Order keys in match block template. Fixes #76
Merge branch 'sort_match_block'