Update todo
Merge branch 'master' of github.com:cgag/bookmarking
remove old comments
Add :user-id to contexts and enforce that it's a number.

Remove old comments