New Config setup
includes for private data

added:
mail function at cfg/push.yml
cleanup

some cleanup work
Merge branch 'develop'

Conflicts:
	config.yml