serializers fix
aggregation fix
use serializers in state.file
implements sls renderer
implement sls external pillar
implement merging strategy into pillar
Merge branch 'serializers-migration' of https://github.com/johnnoone/salt into johnnoone-serializers-migration

Conflicts:
	salt/pillar/__init__.py
Merge branch 'johnnoone-serializers-migration' into develop
rename the sls renderer to the yamlex renderer