Hopefully making nginx more configurable
More fixes
babushka improvements
Merge remote-tracking branch 'origin/master'

Conflicts:
	php.rb