Merge pull request #77 from fiftyandfiftyorg/tracy

Tracy - fix gravity forms on [takeaction]
consolidate testimony shortcode
Merge branch 'tracy' of github.com:fiftyandfiftyorg/buildon into tracy