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'
Adjust bookmark labels and buttons

 - Change how bookmark labels are displayed based on whether tip is bookmarked by user
 - Move the add/remove bookmark button from sidebar to tip header