settings, yeah
git the hell out of this thing.
Don't track error logs.
Add the Puppet modules for mysql and stdlib.
Ignore compiled smarty templates for widgets.
Move configuration to a .env file.
Merge branch 'master' of github.com:waltz/openurban

Conflicts:
	.gitignore
	LocalSettings.php
	LocalSettings_EN.php