Added ribbon, additional name mappings.
Merge branch 'master' of https://github.com/adamwyss/waffle