Various Set-up Changes
Merge remote-tracking branch 'origin/feature-plugin-manager'

Conflicts:
	.gitignore