updates for mullen_production
Merge branch 'master' of github.com:douglasgoodwin/webapp-server-with-ansible

Conflicts:
	devops/setup_database.yml
	devops/templates/my.cnf