yet another wip commit
Merge branch 'master' of github.com:medialab/reference_manager