Updated the email shortcode to allow for a label
Updated the email shortcode to allow for a title attribute
Merge branch 'develop'

Conflicts:
	linchpin-shortcodes.php

Also added in some more context to the shortcake attributes.