fix issues with gitignore and settings.php being committed.
Merge remote-tracking branch 'drastik/fix-gitignore' into housing

Conflicts:
	.gitignore