updated EE config files. updated ignore to include these files
Merge branch 'master' of github.com:noslouch/shanghai-home
Merge branch 'master' of github.com:noslouch/shanghai-home into develop

Conflicts:
	.gitignore