Merge branch 'master' into cleanup_lwrps
Merge branch 'cleanup_lwrps' into integration
bump version for upload
Pull the source down for the apache web recipe so it can be on its own box
Merge branch 'upstream' into integration
Merge branch 'zabbix_api' into integration
Merge branch 'upstream' into pull_source_for_web_apache
Merge branch 'pull_source_for_web_apache' into integration
Merge branch 'zabbix_api' into integration

Conflicts:
	recipes/web_apache.rb
bump version
Add allowed_user_hosts to determine what machines the db user can connect to the db from
Merge branch 'upstream' into allowed_user_hosts
unbump because i was faking versioning locally
Default allowed user host to localhost instead of wildcard
typo
Merge pull request #70 from RiotGames/allowed_user_hosts

Allowed user hosts
Merge branch 'upstream'