Use Table for CSV; use generic language where possible in views
Merge branch 'master' of https://github.com/caktus/rapidsms-nutrition