Ignore local settings
Merge branch 'master' of github.com:sunlightlabs/earwig

Conflicts:
	.gitignore