Added mr, beets and geeknote.

Rebased and fixed conflicts