Subbing out bookmark html for helper

Also changing behavior of color of bookmark button to reflect whether a
user has bookmarked the tip.
Resolve merge conflict
Merge branch 'machuga-button-tweaks'