Update linchpin-shortcodes.php
Merge branch 'develop'

Conflicts:
	linchpin-shortcodes.php

Also added in some more context to the shortcake attributes.