add options per user, model, view, test
Merge branch 'master' of https://github.com/aneumeier/feeds