Fix up the shortcuts for using facades
Fix up some name issues
Merge branch 'master' of github.com:alfred-nutile-inc/fixturizer