Added wiki model, updated user model, part of #20