Merge pull request #124 from dhain/master

use inventory_hostname for database_master