Shortcode, style updates
Re-adding G+ link into header
Merging, omfg