Updated parser and added new shortcodes
Merge branch 'master' of github.com:PebbleRoad/shortcode-parser-for-gather-content