proper keywords + article model
Merge branch 'master' of https://github.com/jatska/magazine