Incude an nginx additions file, so provisioners can add any extra configuration valules etc
Revert "Set the innodb_buffer_pool_size limit to 40M"

This reverts commit 7abc8d2fe2bb8ca6148d66e72a1404de18022be0.

Conflicts:
	config/salt/config/mysql/my.cnf
Support for index.html files in default Nginx config
Merge pull request #61 from humanmade/index-support

Support for index.html files in default Nginx config
Put a wildcard in the include filename, which instructs nginx to to a search match
Merge pull request #58 from humanmade/nginx-include

Incude an nginx additions file, so provisioners can add any extra configuration valules etc
Merge branch 'master' into vmware
Nfs doesn't seem to work on VMWare