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
Merge branch 'allowed_user_hosts' into integration

Conflicts:
	metadata.rb