Do not allow someone to commit a LocalSettings.js file

Change-Id: I6fea82854f2da3bff75d90cc2de1c4811500d89a
Update to submodules and make script

Change-Id: I650c0d8b23d67b22cfb5b5b49ac3f9171b754ed0
Updating all submodules

Change-Id: I94f4d71ae42af3f5038ba0e337668d75b3e12726
Merge remote-tracking branch 'origin/master' into wmf-deploy

Conflicts:
	.gitignore

Change-Id: Ifbf00dfe31dd8a4c74cbe6b0cc511249a8b5f014
Do not automatically rebase

Change-Id: I6d145467dea9baecc35329bb34a573e671e9b008