Fixed issue where calls to builder weren't working
Merge branch 'feature/refactor-shortcodes' of https://github.com/bigspring/monolith into feature/refactor-shortcodes

Conflicts:
	index.php
Removed test code