Updated shortcode to return, not echo
Merge pull request #1 from bradp/master

Updated shortcode to return not echo