Some refactoring
Merge branch 'source_install'

Conflicts:
	recipes/server_nginx.rb