Ignore paths from OS X
Add support for file generated from /proc/cpuinfo on system with no access to /proc #unforkboa
Manage extra GRANTS to allow SQL remote access via SSH tunneling which depends on '127.0.0.1' and will not work with GRANTS for 'localhost'.
Nginx: Update config includes to match optional BOA features improvements #unforkboa
Fix spacing in config lines.
Nginx: Sanitize aliases in vhost_disabled.tpl.php to avoid: 'nginx: [warn] server name "foo.com/bar" has suspicious symbols'
Nginx: Update vhosts templates to match BOA improvements #unforkboa
Merge remote-tracking branch 'origin/6.x-2.x' into 2.3.x-dev

Conflicts:
	Provision/Config/Drupal/provision_drupal_settings.tpl.php
	http/Provision/Config/Nginx/Ssl/vhost_ssl_disabled.tpl.php
	http/Provision/Config/Nginx/vhost_disabled.tpl.php