Added initial shortcode support.
Took out non-exsistent options
Merge branch 'shortcodes'

Conflicts:
	functions.php