Refactored according to WordPress Coding Standards
Merge branch 'master' of https://github.com/joemckie/horizon-framework

Conflicts:
	_horizon/horizon-custom-scripts.php
	_theme/includes/hooks.php
	_theme/templates/shortcodes/style.css
	functions.php
	style.css
Refactored after conflict fix
Merge branch 'master' of https://github.com/joemckie/horizon-framework

Conflicts:
	_horizon/horizon-core-functions.php
Refactored after conflict fix