actually, handle global filters properly. 

Signed-off-by: Matt Barba <matt@placester.com>
Merge branch 'staging' of github.com:Placester/builder into staging

Conflicts:
	helpers/global-filters.php