Merge branch 'feature/MISGD-382-Remove-vhost-from-hosts-file' into unstable/MISGD
Merge branch 'feature/Separate-cache-and-fullpage-cache' into unstable/MISGD
Merge branch 'master' into unstable/MISGD
Merge branch 'hotfix/vcl-double-quote-missing' into unstable/MISGD
Merge branch 'feature/fix-developer_mode-bug-on-default-attributes' into unstable/MISGD
Merge remote-tracking branch 'marcol/unstable/MISGD' into release/0.1.0
Merge branch 'feature/MX-GeoIp-module-compatibility' into release/0.1.0
Merge branch 'feature/MX-GeoIp-module-compatibility' into release/0.1.0
Merge branch 'feature/compress-javascript-files' into release/0.1.0
Merge branch 'feature/improve-static-files-caching' into release/0.1.0
skip caching if the session id is given in the url
Merge branch 'feature/improve-static-files-caching' into release/0.1.0
Merge branch 'feature/pipe-when-SID-is-in-url' into release/0.1.0
Merge branch 'feature/pipe-varnish-storeswitcher-queries' into release/0.1.0
Merge branch 'feature/add-status-loopback-host' into release/0.1.0
Merge pull request #1 from mlopes/feature/Fix-500s

Swap order of if's to allow for exceptional handling of 500 errors
remove saintmode from the maint. page response and cache it for 1 second
Add all servernames to /etc/hosts file
Merge remote-tracking branch 'upstream/develop' into feature/Add-servernames-to-hosts-file

Conflicts:
	recipes/hosts.rb
	templates/default/hosts.erb

This merge reverts local changes from branch feature/Add-servernames-to-hosts-file
Allow for custom hostnames to be added to hosts file