Added 'yaml' to required modules
Added config directory
Resolving conflicts
Conflict fix
Merge branch 'master' of https://github.com/Hobbit71/ssrs2insights

Conflicts:
	.gitignore