Added support for ingredient types.  Fixes #27.

All ingredients have their own types now.  The admin page supports displaying and filtering on those types.
Fixed typo while I was here.
Merge branch 'feature/issue-27' into develop