Grouped file location definitions together
Merge branch 'master' of https://github.com/rasputine/pynginx

Conflicts:
	pynginx