Fixed some issues with custom formatting.  Maybe...
Merge branch 'master' of https://github.com/brycecall/catering